Dave Jarvis' Repositories

Home Files Commits Tags Clone

Repository:

git clone https://repo.autonoma.ca/repo/keenwrite.git

A .classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java">
 		<attributes>
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/main/resources">
 		<attributes>
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<accessrules>
 			<accessrule kind="accessible" pattern="javafx/**"/>
 		</accessrules>
 	</classpathentry>
 	<classpathentry exported="true" kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

A .gitattributes

 # always use LF line endings
 # ALL FILES:
 #   Normalize line endings to LF on checkin and
 #   prevent conversion to CRLF when the file is checked out.
 * text eol=lf
 # BINARY FILES:
 #   Disable line ending normalize on checkin.
 *.gif binary
 *.jar binary
 *.png binary
 *.zip binary

A .gitignore

 /bin/
 /build/
 /.gradle/
 /gradle/
 /.nb-gradle
 /private
 .nb-gradle-properties
 scrivenvar.pro

A .project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>Markdown Writer FX</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
 			<id>1438449113801</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
 			</matcher>
 		</filter>
 		<filter>
 			<id>1438449113801</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-projectRelativePath-matches-false-false-.gradle</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
 </projectDescription>

A .settings/org.eclipse.buildship.core.prefs

 GRADLE_BUILD_COMMANDS=org.eclipse.jdt.core.javabuilder
 GRADLE_NATURES=org.eclipse.jdt.core.javanature
 build.commands=org.eclipse.jdt.core.javabuilder
 connection.arguments=
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.gradle.user.home=null
 connection.java.home=null
 connection.jvm.arguments=
 connection.project.dir=
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature
 project.path=\:

A .settings/org.eclipse.core.runtime.prefs

	1	eclipse.preferences.version=1
	2	line.separator=\n
1	3

A .settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.8

A .settings/org.eclipse.jdt.ui.prefs

 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javafx;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
 sp_cleanup.add_missing_deprecated_annotations=true
 sp_cleanup.add_missing_methods=false
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=true
 sp_cleanup.add_missing_override_annotations_interface_methods=true
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=true
 sp_cleanup.always_use_parentheses_in_expressions=false
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
 sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=false
 sp_cleanup.format_source_code_changes_only=false
 sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
 sp_cleanup.make_private_fields_final=true
 sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=true
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
 sp_cleanup.on_save_use_additional_actions=true
 sp_cleanup.organize_imports=false
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
 sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
 sp_cleanup.remove_redundant_type_arguments=true
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
 sp_cleanup.remove_unnecessary_casts=true
 sp_cleanup.remove_unnecessary_nls_tags=false
 sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
 sp_cleanup.remove_unused_private_methods=true
 sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
 sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=false
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=true
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
 sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
 sp_cleanup.use_type_arguments=false

A .travis.yml

 language: java
 jdk:
 - oraclejdk8
 # enable Java 8u45+, see https://github.com/travis-ci/travis-ci/issues/4042
 addons:
   apt:
     packages:
       - oracle-java8-installer
 os:
   - linux
 # run in container
 sudo: false

A CHANGES.md

 # Change Log
 ## 0.7
 - Load YAML variables from files
 - Added cursor to the preview pane
 - Reconfigured constants to use settings
 - Organized MainWindow code by similar method calls
 - Added single entry point for refreshing file editor tab
 ## 0.6
 - Revised synchronized scrolling with preview panel
 - Added universal character encoding detection
 - Removed options panel
 - Decoupled Editor Tab and Preview Pane
 ## 0.5
 - Added document processors for Markdown and Variables
 - Simplified code base
 - Added `Ctrl+Space` hot key for quick variable injection
 - Replaced commonmark-java with flexmark
 - Insert `CARETPOSITION` into document for preview pane scroll position reference
 ## 0.4
 - Changed name to Scrivenvar
 - Added hot-keys for variable mode and autocomplete
 - Replaced pegdown with commonmark-java
 - Started document processors to provide XSLT and variable dereferencing
 ## 0.3
 - Changed name to Scrivendor
 - Changed logo to match
 - Started to implement service-oriented architecture
 ## 0.2
 - RichTextFX (and dependencies) updated to version 0.6.10 (fixes bugs)
 - pegdown Markdown parser updated to version 1.6
 - Added five new pegdown 1.6 extension flags to Markdown Options tab
 - Minor improvements
 ## 0.1
 - Initial release

A CREDITS.md

 Credits
 ===
   * Dave Jarvis: [Scrivenvar](https://github.com/DaveJarvis/scrivenvar/)
   * Karl Tauber: [Markdown Writer FX](https://github.com/JFormDesigner/markdown-writer-fx)
   * Tomas Mikula: [RichTextFX](https://github.com/TomasMikula/RichTextFX), [ReactFX](https://github.com/TomasMikula/ReactFX), [WellBehavedFX](https://github.com/TomasMikula/WellBehavedFX), [Flowless](https://github.com/TomasMikula/Flowless), and [UndoFX](https://github.com/TomasMikula/UndoFX)
   * Mikael Grev: [MigLayout](http://www.miglayout.com/)
   * Tom Eugelink: [MigPane](https://github.com/mikaelgrev/miglayout/blob/master/javafx/src/main/java/org/tbee/javafx/scene/layout/fxml/MigPane.java)
   * Vladimir Schneider: [flexmark](https://website.com)
   * Jens Deters: [FontAwesomeFX](https://bitbucket.org/Jerady/fontawesomefx)
   * Shy Shalom, Kohei Taketa: [juniversalchardet](https://github.com/takscape/juniversalchardet)

A LICENSE

 Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

A README.md

 ![Logo](images/logo64.png)
 Scrivenvar
 ===
 Word processing with variables.
 ![Screenshot](images/screenshot.png)
 Features
 ---
 * User-defined variables
 * Recursive variable definitions
 * Real-time document preview with variable substitution
 * Platform independent (Windows, Linux, MacOS)
 * Auto-insert variable names pressing `Control+Space`
 Future Features
 ---
 * Spell check
 * Search and replace, with or without variables
 * XML and XSL processing
 * R integration using [Rserve](https://rforge.net/Rserve/)
 * Re-organize variable names
 Requirements
 ---
 Download and install [Java 8u40](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
 Installation
 ---
 . [Download](https://github.com/DaveJarvis/scrivenvar/releases) the latest zip archive and extract it to any folder.
 . Double-click `scrivenvar.jar` to start the application.
 License
 ---
 This software is licensed under the [BSD 2-Clause License](LICENSE).

A Scrivenvar.jfdproj

 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <entry key="classpath1" value="bin" />
   <entry key="classpath2" value="lib/fontawesomefx-8.9.jar" />
   <entry key="sourcefolders1" value="src/main/java" />
   <entry key="sourcefolders2" value="src/main/resources" />
   <node name="designer">
     <entry key="_i18nJavaSettingsEnabled" value="true" />
     <entry key="_i18nSettingsEnabled" value="true" />
     <entry key="i18n.externalizeexcludes1" value="com.scrivenvar.controls.EscapeTextField#escapeCharacters" />
     <entry key="i18n.externalizeexcludes2" value="com.scrivenvar.controls.WebHyperlink#uri" />
     <entry key="i18n.javagetstringformat" value="Messages.get(${key})" />
   </node>
   <node name="javacodegenerator">
     <entry key="_codeStyleSettingsEnabled" value="true" />
     <entry key="_generalSettingsEnabled" value="true" />
     <entry key="explicitimports" value="true" />
     <entry key="lineseparator" value="\n" />
   </node>
 </project>

A USAGE.md

 # Introduction
 This document describes how to write documentation (technical or otherwise) using a master copy for generating a variety of output formats, such as: HTML pages, PDFs, and EPUBs. What's more, the document provides an overview of how to use variables and--for the unintimidated--leverage the power of R, a programming language.
 # Software Requirements
 Install Java, ConTeXt, Pandoc, R, and Lib V8. Then install the R packages knitr, yaml, and devtools, and pluralize by running the following commands:
     sudo su -
     apt-get install default-jre
     apt-get install context
     apt-get install pandoc
     apt-get install r
     apt-get install libv8-dev
+    r
     url <- "http://cran.us.r-project.org"
     install.packages('knitr', repos=url)
     install.packages('yaml', repos=url)
     install.packages('devtools', repos=url)
     devtools::install_github("hrbrmstr/pluralize")
 To exit R, press `Ctrl+d` or type `q()` followed by pressing `Enter`.
 The required software packages are installed.
 # Markdown
 |Table|Table|
 |---|---|
 |Data|Data|

A build.gradle

 version = '0.5'
 apply plugin: 'java'
 apply plugin: 'java-library-distribution'
 apply plugin: 'application'
 sourceCompatibility = 1.8
 mainClassName = 'com.scrivenvar.Main'
 repositories {
 	jcenter()
+}
 compileJava {
   options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+}
 dependencies {
   compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.7-M2'
 	compile group: 'com.miglayout', name: 'miglayout-javafx', version: '5.0'
 	compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.5.0'
   compile group: 'org.ahocorasick', name: 'ahocorasick', version: '0.3.0'
   compile group: 'com.vladsch.flexmark', name: 'flexmark', version: '0.6.1'
   compile group: 'com.vladsch.flexmark', name: 'flexmark-ext-gfm-tables', version: '0.6.1'
   compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.8.4'
   compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.4'
   compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.8.4'
   compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.8.4'
   compile group: 'org.yaml', name: 'snakeyaml', version: '1.17'
   compile group: 'com.googlecode.juniversalchardet', name: 'juniversalchardet', version: '1.0.3'
   compile group: 'commons-configuration', name: 'commons-configuration', version: '1.10'
+}
 jar {
 	baseName = 'scrivenvar'
   from {
     (configurations.runtime).collect {
       it.isDirectory() ? it : zipTree(it)
+    }
+  }
 	manifest {
 		attributes 'Main-Class': mainClassName,
 					'Class-Path': configurations.compile.collect { 'lib/' + it.getName() }.join(' ')
+	}
+}
 distributions {
 	main {
 		baseName = 'scrivenvar'
 		contents {
 			from { ['LICENSE', 'README.md'] }
 			into( 'images' ) {
 				from { 'images' }
+			}
+		}
+	}
+}

A gradle.properties

A images/logo64.png

Binary file

A images/screenshot.png

Binary file

A settings.gradle

A src/main/java/com/scrivenvar/AbstractPane.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.Options;
 import java.util.prefs.Preferences;
 import org.tbee.javafx.scene.layout.fxml.MigPane;
 /**
  * Provides options to all subclasses.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class AbstractPane extends MigPane {
   private final Options options = Services.load( Options.class );
   protected Options getOptions() {
     return this.options;
+  }
   protected Preferences getState() {
     return getOptions().getState();
+  }
+}

A src/main/java/com/scrivenvar/Constants.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.service.Settings;
 /**
  * @author White Magic Software, Ltd.
  */
 public class Constants {
   private static final Settings SETTINGS = Services.load( Settings.class );
   /**
    * Prevent instantiation.
    */
   private Constants() {
+  }
   private static String get( final String key ) {
     return SETTINGS.getSetting( key, "" );
+  }
   // Bootstrapping...
   public static final String SETTINGS_NAME = "/com/scrivenvar/settings.properties";
   public static final String APP_BUNDLE_NAME = get( "application.messages" );
   public static final String STYLESHEET_SCENE = get( "file.stylesheet.scene" );
   public static final String STYLESHEET_MARKDOWN = get( "file.stylesheet.markdown" );
   public static final String STYLESHEET_PREVIEW = get( "file.stylesheet.preview" );
   public static final String FILE_LOGO_16 = get( "file.logo.16" );
   public static final String FILE_LOGO_32 = get( "file.logo.32" );
   public static final String FILE_LOGO_128 = get( "file.logo.128" );
   public static final String FILE_LOGO_256 = get( "file.logo.256" );
   public static final String FILE_LOGO_512 = get( "file.logo.512" );
   public static final String CARET_POSITION_BASE = get( "caret.token.base" );
   public static final String CARET_POSITION_MD = get( "caret.token.markdown" );
   public static final String CARET_POSITION_XML = get( "caret.token.xml" );
   public static final String CARET_POSITION_HTML = get( "caret.token.html" );
   public static final String PREFS_ROOT = get( "preferences.root" );
   public static final String PREFS_ROOT_STATE = get( "preferences.root.state" );
   public static final String PREFS_ROOT_OPTIONS = get( "preferences.root.options" );
+}

A src/main/java/com/scrivenvar/FileEditorTab.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.editors.markdown.MarkdownEditorPane;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.events.AlertMessage;
 import com.scrivenvar.service.events.AlertService;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import static java.util.Locale.ENGLISH;
 import java.util.function.Consumer;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.event.Event;
 import javafx.scene.Node;
 import javafx.scene.control.Tab;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.InputEvent;
 import javafx.scene.text.Text;
 import org.fxmisc.undo.UndoManager;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import org.fxmisc.wellbehaved.event.InputMap;
 import org.mozilla.universalchardet.UniversalDetector;
 /**
  * Editor for a single file.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class FileEditorTab extends Tab {
   private final Options options = Services.load( Options.class );
   private final AlertService alertService = Services.load( AlertService.class );
   private EditorPane editorPane;
   /**
    * Character encoding used by the file (or default encoding if none found).
    */
   private Charset encoding;
   private final ReadOnlyBooleanWrapper modified = new ReadOnlyBooleanWrapper();
   private final BooleanProperty canUndo = new SimpleBooleanProperty();
   private final BooleanProperty canRedo = new SimpleBooleanProperty();
   private Path path;
   FileEditorTab( final Path path ) {
     setPath( path );
     this.modified.addListener( (observable, oldPath, newPath) -> updateTab() );
     updateTab();
     setOnSelectionChanged( e -> {
       if( isSelected() ) {
         Platform.runLater( () -> activated() );
+      }
     } );
+  }
   private void updateTab() {
     setText( getTabTitle() );
     setGraphic( getModifiedMark() );
     setTooltip( getTabTooltip() );
+  }
   /**
    * Returns the base filename (without the directory names).
+   *
    * @return The untitled text if the path hasn't been set.
    */
   private String getTabTitle() {
     final Path filePath = getPath();
     return (filePath == null)
       ? Messages.get( "FileEditor.untitled" )
       : filePath.getFileName().toString();
+  }
   /**
    * Returns the full filename represented by the path.
+   *
    * @return The untitled text if the path hasn't been set.
    */
   private Tooltip getTabTooltip() {
     final Path filePath = getPath();
     return (filePath == null)
       ? null
       : new Tooltip( filePath.toString() );
+  }
   /**
    * Returns a marker to indicate whether the file has been modified.
+   *
    * @return "*" when the file has changed; otherwise null.
    */
   private Text getModifiedMark() {
     return isModified() ? new Text( "*" ) : null;
+  }
   /**
    * Called when the user switches tab.
    */
   private void activated() {
     // Tab is closed or no longer active.
     if( getTabPane() == null || !isSelected() ) {
       return;
+    }
     // Switch to the tab without loading if the contents are already in memory.
     if( getContent() != null ) {
       getEditorPane().requestFocus();
       return;
+    }
     // Load the text and update the preview before the undo manager.
     load();
     // Track undo requests -- can only be called *after* load.
     initUndoManager();
     initLayout();
     initFocus();
+  }
   private void initLayout() {
     setContent( getScrollPane() );
+  }
   private Node getScrollPane() {
     return getEditorPane().getScrollPane();
+  }
   private void initFocus() {
     getEditorPane().requestFocus();
+  }
   private void initUndoManager() {
     final UndoManager undoManager = getUndoManager();
     // Clear undo history after first load.
     undoManager.forgetHistory();
     // Bind the editor undo manager to the properties.
     modified.bind( Bindings.not( undoManager.atMarkedPositionProperty() ) );
     canUndo.bind( undoManager.undoAvailableProperty() );
     canRedo.bind( undoManager.redoAvailableProperty() );
+  }
   /**
    * Returns the index into the text where the caret blinks happily away.
+   *
    * @return A number from 0 to the editor's document text length.
    */
   public int getCaretPosition() {
     return getEditorPane().getEditor().getCaretPosition();
+  }
   /**
    * Returns true if the given path exactly matches this tab's path.
+   *
    * @param check The path to compare against.
+   *
    * @return true The paths are the same.
    */
   public boolean isPath( final Path check ) {
     final Path filePath = getPath();
     return filePath == null ? false : filePath.equals( check );
+  }
   /**
    * Reads the entire file contents from the path associated with this tab.
    */
   private void load() {
     final Path filePath = getPath();
     if( filePath != null ) {
       try {
         getEditorPane().setText( asString( Files.readAllBytes( filePath ) ) );
       } catch( Exception ex ) {
         alert(
           "FileEditor.loadFailed.title", "FileEditor.loadFailed.message", ex
         );
+      }
+    }
+  }
   /**
    * Saves the entire file contents from the path associated with this tab.
+   *
    * @return true The file has been saved.
    */
   public boolean save() {
     try {
       Files.write( getPath(), asBytes( getEditorPane().getText() ) );
       getEditorPane().getUndoManager().mark();
       return true;
     } catch( Exception ex ) {
       return alert(
         "FileEditor.saveFailed.title", "FileEditor.saveFailed.message", ex
       );
+    }
+  }
   /**
    * Creates an alert dialog and waits for it to close.
+   *
    * @param titleKey Resource bundle key for the alert dialog title.
    * @param messageKey Resource bundle key for the alert dialog message.
    * @param e The unexpected happening.
+   *
    * @return false
    */
   private boolean alert(
     final String titleKey, final String messageKey, final Exception e ) {
     final AlertService service = getAlertService();
     final AlertMessage message = service.createAlertMessage(
       Messages.get( titleKey ),
       Messages.get( messageKey ),
       getPath(),
       e.getMessage()
     );
     service.createAlertError( message ).showAndWait();
     return false;
+  }
   /**
    * Returns a best guess at the file encoding. If the encoding could not be
    * detected, this will return the default charset for the JVM.
+   *
    * @param bytes The bytes to perform character encoding detection.
+   *
    * @return The character encoding.
    */
   private Charset detectEncoding( final byte[] bytes ) {
     final UniversalDetector detector = new UniversalDetector( null );
     detector.handleData( bytes, 0, bytes.length );
     detector.dataEnd();
     final String charset = detector.getDetectedCharset();
     final Charset charEncoding = charset == null
       ? Charset.defaultCharset()
       : Charset.forName( charset.toUpperCase( ENGLISH ) );
     detector.reset();
     return charEncoding;
+  }
   /**
    * Converts the given string to an array of bytes using the encoding that was
    * originally detected (if any) and associated with this file.
+   *
    * @param text The text to convert into the original file encoding.
+   *
    * @return A series of bytes ready for writing to a file.
    */
   private byte[] asBytes( final String text ) {
     return text.getBytes( getEncoding() );
+  }
   /**
    * Converts the given bytes into a Java String. This will call setEncoding
    * with the encoding detected by the CharsetDetector.
+   *
    * @param text The text of unknown character encoding.
+   *
    * @return The text, in its auto-detected encoding, as a String.
    */
   private String asString( final byte[] text ) {
     setEncoding( detectEncoding( text ) );
     return new String( text, getEncoding() );
+  }
   Path getPath() {
     return this.path;
+  }
   void setPath( final Path path ) {
     this.path = path;
+  }
   public boolean isModified() {
     return this.modified.get();
+  }
   ReadOnlyBooleanProperty modifiedProperty() {
     return this.modified.getReadOnlyProperty();
+  }
   BooleanProperty canUndoProperty() {
     return this.canUndo;
+  }
   BooleanProperty canRedoProperty() {
     return this.canRedo;
+  }
   private UndoManager getUndoManager() {
     return getEditorPane().getUndoManager();
+  }
   /**
    * Forwards the request to the editor pane.
+   *
    * @param <T> The type of event listener to add.
    * @param <U> The type of consumer to add.
    * @param event The event that should trigger updates to the listener.
    * @param consumer The listener to receive update events.
    */
   public <T extends Event, U extends T> void addEventListener(
     final EventPattern<? super T, ? extends U> event,
     final Consumer<? super U> consumer ) {
     getEditorPane().addEventListener( event, consumer );
+  }
   /**
    * Forwards to the editor pane's listeners for keyboard events.
+   *
    * @param map The new input map to replace the existing keyboard listener.
    */
   public void addEventListener( final InputMap<InputEvent> map ) {
     getEditorPane().addEventListener( map );
+  }
   /**
    * Forwards to the editor pane's listeners for keyboard events.
+   *
    * @param map The existing input map to remove from the keyboard listeners.
    */
   public void removeEventListener( final InputMap<InputEvent> map ) {
     getEditorPane().removeEventListener( map );
+  }
   /**
    * Forwards to the editor pane's listeners for text change events.
+   *
    * @param listener The listener to notify when the text changes.
    */
   public void addTextChangeListener( final ChangeListener<String> listener ) {
     getEditorPane().addTextChangeListener( listener );
+  }
   /**
    * Forwards to the editor pane's listeners for caret paragraph change events.
+   *
    * @param listener The listener to notify when the caret changes paragraphs.
    */
   public void addCaretParagraphListener( final ChangeListener<Integer> listener ) {
     getEditorPane().addCaretParagraphListener( listener );
+  }
   /**
    * Forwards the request to the editor pane.
+   *
    * @return The text to process.
    */
   public String getEditorText() {
     return getEditorPane().getText();
+  }
   /**
    * Returns the editor pane, or creates one if it doesn't yet exist.
+   *
    * @return The editor pane, never null.
    */
   protected EditorPane getEditorPane() {
     if( this.editorPane == null ) {
       this.editorPane = new MarkdownEditorPane();
+    }
     return this.editorPane;
+  }
   private AlertService getAlertService() {
     return this.alertService;
+  }
   private Options getOptions() {
     return this.options;
+  }
   private Charset getEncoding() {
     return this.encoding;
+  }
   private void setEncoding( final Charset encoding ) {
     this.encoding = encoding;
+  }
   /**
    * Returns the tab title, without any modified indicators.
+   *
    * @return The tab title.
    */
   @Override
   public String toString() {
     return getTabTitle();
+  }
+}

A src/main/java/com/scrivenvar/FileEditorTabPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import com.scrivenvar.predicates.files.FileTypePredicate;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.Settings;
 import com.scrivenvar.service.events.AlertMessage;
 import com.scrivenvar.service.events.AlertService;
 import static com.scrivenvar.service.events.AlertService.NO;
 import static com.scrivenvar.service.events.AlertService.YES;
 import com.scrivenvar.util.Utils;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.scene.Node;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TabPane.TabClosingPolicy;
 import javafx.scene.input.InputEvent;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Window;
 import org.fxmisc.richtext.StyledTextArea;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import org.fxmisc.wellbehaved.event.InputMap;
 import static com.scrivenvar.Messages.get;
 /**
  * Tab pane for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class FileEditorTabPane extends TabPane {
   private final static String FILTER_EXTENSIONS = "filter.file";
   private final static String FILTER_EXTENSION_TITLES = "Dialog.file.choose.filter";
   private final Options options = Services.load( Options.class );
   private final Settings settings = Services.load( Settings.class );
   private final AlertService alertService = Services.load( AlertService.class );
   private final ReadOnlyObjectWrapper<Path> openDefinition = new ReadOnlyObjectWrapper<>();
   private final ReadOnlyObjectWrapper<FileEditorTab> activeFileEditor = new ReadOnlyObjectWrapper<>();
   private final ReadOnlyBooleanWrapper anyFileEditorModified = new ReadOnlyBooleanWrapper();
   /**
    * Constructs a new file editor tab pane.
    */
   public FileEditorTabPane() {
     final ObservableList<Tab> tabs = getTabs();
     setFocusTraversable( false );
     setTabClosingPolicy( TabClosingPolicy.ALL_TABS );
     addTabSelectionListener(
       (ObservableValue<? extends Tab> tabPane,
         final Tab oldTab, final Tab newTab) -> {
         if( newTab != null ) {
           activeFileEditor.set( (FileEditorTab)newTab );
+        }
+      }
     );
     final ChangeListener<Boolean> modifiedListener = (observable, oldValue, newValue) -> {
       for( final Tab tab : tabs ) {
         if( ((FileEditorTab)tab).isModified() ) {
           this.anyFileEditorModified.set( true );
           break;
+        }
+      }
     };
     tabs.addListener(
       (ListChangeListener<Tab>)change -> {
         while( change.next() ) {
           if( change.wasAdded() ) {
             change.getAddedSubList().stream().forEach( (tab) -> {
               ((FileEditorTab)tab).modifiedProperty().addListener( modifiedListener );
             } );
           } else if( change.wasRemoved() ) {
             change.getRemoved().stream().forEach( (tab) -> {
               ((FileEditorTab)tab).modifiedProperty().removeListener( modifiedListener );
             } );
+          }
+        }
         // Changes in the tabs may also change anyFileEditorModified property
         // (e.g. closed modified file)
         modifiedListener.changed( null, null, null );
+      }
     );
+  }
   /**
    * Delegates to the active file editor.
+   *
    * @param <T> Event type.
    * @param <U> Consumer type.
    * @param event Event to pass to the editor.
    * @param consumer Consumer to pass to the editor.
    */
   public <T extends Event, U extends T> void addEventListener(
     final EventPattern<? super T, ? extends U> event,
     final Consumer<? super U> consumer ) {
     getActiveFileEditor().addEventListener( event, consumer );
+  }
   /**
    * Delegates to the active file editor pane, and, ultimately, to its text
    * area.
+   *
    * @param map The map of methods to events.
    */
   public void addEventListener( final InputMap<InputEvent> map ) {
     getActiveFileEditor().addEventListener( map );
+  }
   /**
    * Remove a keyboard event listener from the active file editor.
+   *
    * @param map The keyboard events to remove.
    */
   public void removeEventListener( final InputMap<InputEvent> map ) {
     getActiveFileEditor().removeEventListener( map );
+  }
   /**
    * Allows observers to be notified when the current file editor tab changes.
+   *
    * @param listener The listener to notify of tab change events.
    */
   public void addTabSelectionListener( final ChangeListener<Tab> listener ) {
     // Observe the tab so that when a new tab is opened or selected,
     // a notification is kicked off.
     getSelectionModel().selectedItemProperty().addListener( listener );
+  }
   /**
    * Allows clients to manipulate the editor content directly.
+   *
    * @return The text area for the active file editor.
    */
   public StyledTextArea getEditor() {
     return getActiveFileEditor().getEditorPane().getEditor();
+  }
   public FileEditorTab getActiveFileEditor() {
     return this.activeFileEditor.get();
+  }
   public ReadOnlyObjectProperty<FileEditorTab> activeFileEditorProperty() {
     return this.activeFileEditor.getReadOnlyProperty();
+  }
   ReadOnlyBooleanProperty anyFileEditorModifiedProperty() {
     return this.anyFileEditorModified.getReadOnlyProperty();
+  }
   private FileEditorTab createFileEditor( final Path path ) {
     final FileEditorTab tab = new FileEditorTab( path );
     tab.setOnCloseRequest( e -> {
       if( !canCloseEditor( tab ) ) {
         e.consume();
+      }
     } );
     return tab;
+  }
   /**
    * Called when the user selects New from the File menu.
+   *
    * @return The newly added tab.
    */
   void newEditor() {
     final FileEditorTab tab = createFileEditor( null );
     getTabs().add( tab );
     getSelectionModel().select( tab );
+  }
   void openFileDialog() {
     final String title = get( "Dialog.file.choose.open.title" );
     final FileChooser dialog = createFileChooser( title );
     openFiles( dialog.showOpenMultipleDialog( getWindow() ) );
+  }
   /**
    * Opens the files into new editors, unless one of those files was a
    * definition file. The definition file is loaded into the definition pane,
    * but only the first one selected (multiple definition files will result in a
    * warning).
+   *
    * @param files The list of non-definition files that the were requested to
    * open.
+   *
    * @return A list of files that can be opened in text editors.
    */
   private void openFiles( final List<File> files ) {
     final FileTypePredicate predicate
       = new FileTypePredicate( createExtensionFilter( "definition" ).getExtensions() );
     // The user might have opened multiple definitions files. These will
     // be discarded from the text editable files.
     final List<File> definitions
       = files.stream().filter( predicate ).collect( Collectors.toList() );
     // Create a modifiable list to remove any definition files that were
     // opened.
     final List<File> editors = new ArrayList<>( files );
     if( editors.size() > 0 ) {
       saveLastDirectory( editors.get( 0 ) );
+    }
     editors.removeAll( definitions );
     // Open editor-friendly files (e.g,. Markdown, XML) in new tabs.
     if( editors.size() > 0 ) {
       openEditors( editors, 0 );
+    }
     if( definitions.size() > 0 ) {
       openDefinition( definitions.get( 0 ) );
+    }
+  }
   private void openEditors( final List<File> files, final int activeIndex ) {
     final int fileTally = files.size();
     final List<Tab> tabs = getTabs();
     // Close single unmodified "Untitled" tab.
     if( tabs.size() == 1 ) {
       final FileEditorTab fileEditor = (FileEditorTab)(tabs.get( 0 ));
       if( fileEditor.getPath() == null && !fileEditor.isModified() ) {
         closeEditor( fileEditor, false );
+      }
+    }
     for( int i = 0; i < fileTally; i++ ) {
       final Path path = files.get( i ).toPath();
       FileEditorTab fileEditorTab = findEditor( path );
       // Only open new files.
       if( fileEditorTab == null ) {
         fileEditorTab = createFileEditor( path );
         getTabs().add( fileEditorTab );
+      }
       // Select the first file in the list.
       if( i == activeIndex ) {
         getSelectionModel().select( fileEditorTab );
+      }
+    }
+  }
   /**
    * Returns a property that changes when a new definition file is opened.
+   *
    * @return The path to a definition file that was opened.
    */
   public ReadOnlyObjectProperty<Path> onOpenDefinitionFileProperty() {
     return getOnOpenDefinitionFile().getReadOnlyProperty();
+  }
   private ReadOnlyObjectWrapper<Path> getOnOpenDefinitionFile() {
     return this.openDefinition;
+  }
   /**
    * Called when the user has opened a definition file (using the file open
    * dialog box). This will replace the current set of definitions for the
    * active tab.
+   *
    * @param definition The file to open.
    */
   private void openDefinition( final File definition ) {
     // TODO: Prevent reading this file twice when a new text document is opened.
     // (might be a matter of checking the value first).
     getOnOpenDefinitionFile().set( definition.toPath() );
+  }
   boolean saveEditor( final FileEditorTab fileEditor ) {
     if( fileEditor == null || !fileEditor.isModified() ) {
       return true;
+    }
     if( fileEditor.getPath() == null ) {
       getSelectionModel().select( fileEditor );
       final FileChooser fileChooser = createFileChooser( Messages.get( "Dialog.file.choose.save.title" ) );
       final File file = fileChooser.showSaveDialog( getWindow() );
       if( file == null ) {
         return false;
+      }
       saveLastDirectory( file );
       fileEditor.setPath( file.toPath() );
+    }
     return fileEditor.save();
+  }
   boolean saveAllEditors() {
     boolean success = true;
     for( FileEditorTab fileEditor : getAllEditors() ) {
       if( !saveEditor( fileEditor ) ) {
         success = false;
+      }
+    }
     return success;
+  }
   /**
    * Answers whether the file has had modifications. '
+   *
    * @param tab THe tab to check for modifications.
+   *
    * @return false The file is unmodified.
    */
   boolean canCloseEditor( final FileEditorTab tab ) {
     if( !tab.isModified() ) {
       return true;
+    }
     final AlertMessage message = getAlertService().createAlertMessage(
       Messages.get( "Alert.file.close.title" ),
       Messages.get( "Alert.file.close.text" ),
       tab.getText()
     );
     final Alert alert = getAlertService().createAlertConfirmation( message );
     final ButtonType response = alert.showAndWait().get();
     return response == YES ? saveEditor( tab ) : response == NO;
+  }
   private AlertService getAlertService() {
     return this.alertService;
+  }
   boolean closeEditor( FileEditorTab fileEditor, boolean save ) {
     if( fileEditor == null ) {
       return true;
+    }
     final Tab tab = fileEditor;
     if( save ) {
       Event event = new Event( tab, tab, Tab.TAB_CLOSE_REQUEST_EVENT );
       Event.fireEvent( tab, event );
       if( event.isConsumed() ) {
         return false;
+      }
+    }
     getTabs().remove( tab );
     if( tab.getOnClosed() != null ) {
       Event.fireEvent( tab, new Event( Tab.CLOSED_EVENT ) );
+    }
     return true;
+  }
   boolean closeAllEditors() {
     final FileEditorTab[] allEditors = getAllEditors();
     final FileEditorTab activeEditor = getActiveFileEditor();
     // try to save active tab first because in case the user decides to cancel,
     // then it stays active
     if( activeEditor != null && !canCloseEditor( activeEditor ) ) {
       return false;
+    }
     // This should be called any time a tab changes.
     persistPreferences();
     // save modified tabs
     for( int i = 0; i < allEditors.length; i++ ) {
       final FileEditorTab fileEditor = allEditors[ i ];
       if( fileEditor == activeEditor ) {
         continue;
+      }
       if( fileEditor.isModified() ) {
         // activate the modified tab to make its modified content visible to the user
         getSelectionModel().select( i );
         if( !canCloseEditor( fileEditor ) ) {
           return false;
+        }
+      }
+    }
     // Close all tabs.
     for( final FileEditorTab fileEditor : allEditors ) {
       if( !closeEditor( fileEditor, false ) ) {
         return false;
+      }
+    }
     return getTabs().isEmpty();
+  }
   private FileEditorTab[] getAllEditors() {
     final ObservableList<Tab> tabs = getTabs();
     final int length = tabs.size();
     final FileEditorTab[] allEditors = new FileEditorTab[ length ];
     for( int i = 0; i < length; i++ ) {
       allEditors[ i ] = (FileEditorTab)tabs.get( i );
+    }
     return allEditors;
+  }
   /**
    * Returns the file editor tab that has the given path.
+   *
    * @return null No file editor tab for the given path was found.
    */
   private FileEditorTab findEditor( final Path path ) {
     for( final Tab tab : getTabs() ) {
       final FileEditorTab fileEditor = (FileEditorTab)tab;
       if( fileEditor.isPath( path ) ) {
         return fileEditor;
+      }
+    }
     return null;
+  }
   private FileChooser createFileChooser( String title ) {
     final FileChooser fileChooser = new FileChooser();
     fileChooser.setTitle( title );
     fileChooser.getExtensionFilters().addAll(
       createExtensionFilters() );
     final String lastDirectory = getState().get( "lastDirectory", null );
     File file = new File( (lastDirectory != null) ? lastDirectory : "." );
     if( !file.isDirectory() ) {
       file = new File( "." );
+    }
     fileChooser.setInitialDirectory( file );
     return fileChooser;
+  }
   private List<ExtensionFilter> createExtensionFilters() {
     final List<ExtensionFilter> list = new ArrayList<>();
     // TODO: Return a list of all properties that match the filter prefix.
     // This will allow dynamic filters to be added and removed just by
     // updating the properties file.
     list.add( createExtensionFilter( "markdown" ) );
     list.add( createExtensionFilter( "definition" ) );
     list.add( createExtensionFilter( "xml" ) );
     list.add( createExtensionFilter( "all" ) );
     return list;
+  }
   private ExtensionFilter createExtensionFilter( final String filetype ) {
     final String tKey = String.format( "%s.title.%s", FILTER_EXTENSION_TITLES, filetype );
     final String eKey = String.format( "%s.ext.%s", FILTER_EXTENSIONS, filetype );
     return new ExtensionFilter( Messages.get( tKey ), getExtensions( eKey ) );
+  }
   private List<String> getExtensions( final String key ) {
     return getSettings().getStringSettingList( key );
+  }
   private void saveLastDirectory( final File file ) {
     getState().put( "lastDirectory", file.getParent() );
+  }
   public void restorePreferences() {
     int activeIndex = 0;
     final Preferences preferences = getState();
     final String[] fileNames = Utils.getPrefsStrings( preferences, "file" );
     final String activeFileName = preferences.get( "activeFile", null );
     final ArrayList<File> files = new ArrayList<>( fileNames.length );
     for( final String fileName : fileNames ) {
       final File file = new File( fileName );
       if( file.exists() ) {
         files.add( file );
         if( fileName.equals( activeFileName ) ) {
           activeIndex = files.size() - 1;
+        }
+      }
+    }
     if( files.isEmpty() ) {
       newEditor();
     } else {
       openEditors( files, activeIndex );
+    }
+  }
   public void persistPreferences() {
     final ObservableList<Tab> allEditors = getTabs();
     final List<String> fileNames = new ArrayList<>( allEditors.size() );
     for( final Tab tab : allEditors ) {
       final FileEditorTab fileEditor = (FileEditorTab)tab;
       final Path filePath = fileEditor.getPath();
       if( filePath != null ) {
         fileNames.add( filePath.toString() );
+      }
+    }
     final Preferences preferences = getState();
     Utils.putPrefsStrings( preferences, "file", fileNames.toArray( new String[ fileNames.size() ] ) );
     final FileEditorTab activeEditor = getActiveFileEditor();
     final Path filePath = activeEditor == null ? null : activeEditor.getPath();
     if( filePath == null ) {
       preferences.remove( "activeFile" );
     } else {
       preferences.put( "activeFile", filePath.toString() );
+    }
+  }
   private Settings getSettings() {
     return this.settings;
+  }
   protected Options getOptions() {
     return this.options;
+  }
   private Window getWindow() {
     return getScene().getWindow();
+  }
   protected Preferences getState() {
     return getOptions().getState();
+  }
   Node getNode() {
     return this;
+  }
+}

A src/main/java/com/scrivenvar/Main.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import static com.scrivenvar.Constants.*;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.events.AlertService;
 import com.scrivenvar.util.StageState;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 /**
  * Main application entry point. The application allows users to edit Markdown
  * files and see a real-time preview of the edits.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class Main extends Application {
   private static Application app;
   private final MainWindow mainWindow = new MainWindow();
   private final Options options = Services.load( Options.class );
   public static void main( String[] args ) {
     launch( args );
+  }
   /**
    * Application entry point.
+   *
    * @param stage The primary application stage.
+   *
    * @throws Exception Could not read configuration file.
    */
   @Override
   public void start( final Stage stage ) throws Exception {
     initApplication();
     initState( stage );
     initStage( stage );
     initAlertService();
     stage.show();
+  }
   private void initApplication() {
     app = this;
+  }
   private Options getOptions() {
     return this.options;
+  }
   private String getApplicationTitle() {
     return Messages.get( "Main.title" );
+  }
   private StageState initState( Stage stage ) {
     return new StageState( stage, getOptions().getState() );
+  }
   private void initStage( Stage stage ) {
     stage.getIcons().addAll(
       createImage( FILE_LOGO_16 ),
       createImage( FILE_LOGO_32 ),
       createImage( FILE_LOGO_128 ),
       createImage( FILE_LOGO_256 ),
       createImage( FILE_LOGO_512 ) );
     stage.setTitle( getApplicationTitle() );
     stage.setScene( getScene() );
+  }
   private void initAlertService() {
     final AlertService service = Services.load( AlertService.class );
     service.setWindow( getScene().getWindow() );
+  }
   private Scene getScene() {
     return getMainWindow().getScene();
+  }
   private MainWindow getMainWindow() {
     return this.mainWindow;
+  }
   private static Application getApplication() {
     return app;
+  }
   public static void showDocument( String uri ) {
     getApplication().getHostServices().showDocument( uri );
+  }
   private Image createImage( final String filename ) {
     return new Image( filename );
+  }
+}

A src/main/java/com/scrivenvar/MainWindow.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import static com.scrivenvar.Constants.FILE_LOGO_32;
 import static com.scrivenvar.Constants.STYLESHEET_SCENE;
 import static com.scrivenvar.Messages.get;
 import com.scrivenvar.definition.DefinitionFactory;
 import com.scrivenvar.definition.DefinitionPane;
 import com.scrivenvar.definition.DefinitionSource;
 import com.scrivenvar.editors.VariableNameInjector;
 import com.scrivenvar.editors.markdown.MarkdownEditorPane;
 import com.scrivenvar.preview.HTMLPreviewPane;
 import com.scrivenvar.processors.HTMLPreviewProcessor;
 import com.scrivenvar.processors.MarkdownCaretInsertionProcessor;
 import com.scrivenvar.processors.MarkdownCaretReplacementProcessor;
 import com.scrivenvar.processors.MarkdownProcessor;
 import com.scrivenvar.processors.Processor;
 import com.scrivenvar.processors.VariableProcessor;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.util.Action;
 import com.scrivenvar.util.ActionUtils;
 import static com.scrivenvar.util.StageState.K_PANE_SPLIT_DEFINITION;
 import static com.scrivenvar.util.StageState.K_PANE_SPLIT_EDITOR;
 import static com.scrivenvar.util.StageState.K_PANE_SPLIT_PREVIEW;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.BOLD;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.CODE;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.FILE_ALT;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.FILE_CODE_ALT;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.FLOPPY_ALT;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.FOLDER_OPEN_ALT;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.HEADER;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.ITALIC;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.LINK;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.LIST_OL;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.LIST_UL;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.PICTURE_ALT;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.QUOTE_LEFT;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.REPEAT;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.STRIKETHROUGH;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.UNDO;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.prefs.Preferences;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.SplitPane;
 import javafx.scene.control.Tab;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.TreeView;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import static javafx.scene.input.KeyCode.ESCAPE;
 import javafx.scene.input.KeyEvent;
 import static javafx.scene.input.KeyEvent.CHAR_UNDEFINED;
 import static javafx.scene.input.KeyEvent.KEY_PRESSED;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
 /**
  * Main window containing a tab pane in the center for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class MainWindow {
   private final Options options = Services.load( Options.class );
   private Scene scene;
   private DefinitionPane definitionPane;
   private FileEditorTabPane fileEditorPane;
   private HTMLPreviewPane previewPane;
   private VariableNameInjector variableNameInjector;
   private MenuBar menuBar;
   public MainWindow() {
     initLayout();
     initOpenDefinitionListener();
     initTabAddedListener();
     initTabChangeListener();
     initPreferences();
     initVariableNameInjector();
+  }
   /**
    * Listen for file editor tab pane to receive an open definition source event.
    */
   private void initOpenDefinitionListener() {
     getFileEditorPane().onOpenDefinitionFileProperty().addListener(
       (ObservableValue<? extends Path> definitionFile,
         final Path oldPath, final Path newPath) -> {
         final DefinitionSource ds = createDefinitionSource( newPath );
         associate( ds, getActiveFileEditor() );
       } );
+  }
   /**
    * When tabs are added, hook the various change listeners onto the new tab so
    * that the preview pane refreshes as necessary.
    */
   private void initTabAddedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Make sure the text processor kicks off when new files are opened.
     final ObservableList<Tab> tabs = editorPane.getTabs();
     // Update the preview pane on tab changes.
     tabs.addListener(
       (final Change<? extends Tab> change) -> {
         while( change.next() ) {
           if( change.wasAdded() ) {
             // Multiple tabs can be added simultaneously.
             for( final Tab newTab : change.getAddedSubList() ) {
               final FileEditorTab tab = (FileEditorTab)newTab;
               initTextChangeListener( tab );
               initCaretParagraphListener( tab );
+            }
+          }
+        }
+      }
     );
+  }
   /**
    * Reloads the preferences from the previous load.
    */
   private void initPreferences() {
     getFileEditorPane().restorePreferences();
+  }
   /**
    * Listen for new tab selection events.
    */
   private void initTabChangeListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Update the preview pane changing tabs.
     editorPane.addTabSelectionListener(
       (ObservableValue<? extends Tab> tabPane,
         final Tab oldTab, final Tab newTab) -> {
         // If there was no old tab, then this is a first time load, which
         // can be ignored.
         if( oldTab != null ) {
           if( newTab == null ) {
             closeRemainingTab();
           } else {
             // Synchronize the preview with the edited text.
             refreshSelectedTab( (FileEditorTab)newTab );
+          }
+        }
+      }
     );
+  }
   /**
    * Initialize the variable name editor.
    */
   private void initVariableNameInjector() {
     setVariableNameInjector(
       new VariableNameInjector( getFileEditorPane(), getDefinitionPane() )
     );
+  }
   private void initTextChangeListener( final FileEditorTab tab ) {
     tab.addTextChangeListener(
       (ObservableValue<? extends String> editor,
         final String oldValue, final String newValue) -> {
         refreshSelectedTab( tab );
+      }
     );
+  }
   private void initCaretParagraphListener( final FileEditorTab tab ) {
     tab.addCaretParagraphListener(
       (ObservableValue<? extends Integer> editor,
         final Integer oldValue, final Integer newValue) -> {
         refreshSelectedTab( tab );
+      }
     );
+  }
   /**
    * Called whenever the preview pane becomes out of sync with the file editor
    * tab. This can be called when the text changes, the caret paragraph changes,
    * or the file tab changes.
+   *
    * @param tab The file editor tab that has been changed in some fashion.
    */
   private void refreshSelectedTab( final FileEditorTab tab ) {
     final HTMLPreviewPane preview = getPreviewPane();
     preview.setPath( tab.getPath() );
     final Processor<String> hpp = new HTMLPreviewProcessor( preview );
     final Processor<String> mcrp = new MarkdownCaretReplacementProcessor( hpp );
     final Processor<String> mp = new MarkdownProcessor( mcrp );
     final Processor<String> mcip = new MarkdownCaretInsertionProcessor( mp, tab.getCaretPosition() );
     final Processor<String> vp = new VariableProcessor( mcip, getResolvedMap() );
     vp.processChain( tab.getEditorText() );
+  }
   /**
    * TODO: Patch into loading of definition source.
+   *
    * @return
    */
   private Map<String, String> getResolvedMap() {
     return new HashMap<>();
+  }
   /**
    * TODO: Patch into loading of definition source.
+   *
    * @return
    */
   private TreeView<String> getTreeView() {
     return new TreeView<>();
+  }
   /**
    * Called when the tab has changed to a new editor to replace the current
    * definition pane with the
+   *
    * @param tab Reference to the tab that has the file being edited.
    */
   private void updateDefinitionPane( final FileEditorTab tab ) {
     // Look up the path to the variable definition file associated with the
     // given tab.
     final Path path = getVariableDefinitionPath( tab.getPath() );
     final DefinitionSource ds = createDefinitionSource( path );
     associate( ds, tab );
+  }
   private void associate( final DefinitionSource ds, final FileEditorTab tab ) {
     System.out.println( "Associate " + ds + " with " + tab );
+  }
   /**
    * Searches the persistent settings for the variable definition file that is
    * associated with the given path.
+   *
    * @param tabPath The path that may be associated with some variables.
+   *
    * @return A path to the variable definition file for the given document path.
    */
   private Path getVariableDefinitionPath( final Path tabPath ) {
     return new File( "/tmp/variables.yaml" ).toPath();
+  }
   /**
    * Creates a boolean property that is bound to another boolean value of the
    * active editor.
    */
   private BooleanProperty createActiveBooleanProperty(
     final Function<FileEditorTab, ObservableBooleanValue> func ) {
     final BooleanProperty b = new SimpleBooleanProperty();
     final FileEditorTab tab = getActiveFileEditor();
     if( tab != null ) {
       b.bind( func.apply( tab ) );
+    }
     getFileEditorPane().activeFileEditorProperty().addListener(
       (observable, oldFileEditor, newFileEditor) -> {
         b.unbind();
         if( newFileEditor != null ) {
           b.bind( func.apply( newFileEditor ) );
         } else {
           b.set( false );
+        }
+      }
     );
     return b;
+  }
   /**
    * Called when the last open tab is closed. This clears out the preview pane
    * and the definition pane.
    */
   private void closeRemainingTab() {
     getPreviewPane().clear();
     getDefinitionPane().clear();
+  }
   //---- File actions -------------------------------------------------------
   private void fileNew() {
     getFileEditorPane().newEditor();
+  }
   private void fileOpen() {
     getFileEditorPane().openFileDialog();
+  }
   private void fileClose() {
     getFileEditorPane().closeEditor( getActiveFileEditor(), true );
+  }
   private void fileCloseAll() {
     getFileEditorPane().closeAllEditors();
+  }
   private void fileSave() {
     getFileEditorPane().saveEditor( getActiveFileEditor() );
+  }
   private void fileSaveAll() {
     getFileEditorPane().saveAllEditors();
+  }
   private void fileExit() {
     final Window window = getWindow();
     Event.fireEvent( window,
       new WindowEvent( window, WindowEvent.WINDOW_CLOSE_REQUEST ) );
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     Alert alert = new Alert( AlertType.INFORMATION );
     alert.setTitle( get( "Dialog.about.title" ) );
     alert.setHeaderText( get( "Dialog.about.header" ) );
     alert.setContentText( get( "Dialog.about.content" ) );
     alert.setGraphic( new ImageView( new Image( FILE_LOGO_32 ) ) );
     alert.initOwner( getWindow() );
     alert.showAndWait();
+  }
   //---- Convenience accessors ----------------------------------------------
   private float getFloat( final String key, final float defaultValue ) {
     return getPreferences().getFloat( key, defaultValue );
+  }
   private Preferences getPreferences() {
     return getOptions().getState();
+  }
   private Window getWindow() {
     return getScene().getWindow();
+  }
   private MarkdownEditorPane getActiveEditor() {
     return (MarkdownEditorPane)(getActiveFileEditor().getEditorPane());
+  }
   private FileEditorTab getActiveFileEditor() {
     return getFileEditorPane().getActiveFileEditor();
+  }
   //---- Member accessors ---------------------------------------------------
   public Scene getScene() {
     return this.scene;
+  }
   private void setScene( Scene scene ) {
     this.scene = scene;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private synchronized HTMLPreviewPane getPreviewPane() {
     if( this.previewPane == null ) {
       this.previewPane = createPreviewPane();
+    }
     return this.previewPane;
+  }
   private DefinitionPane getDefinitionPane() {
     if( this.definitionPane == null ) {
       this.definitionPane = createDefinitionPane();
+    }
     return this.definitionPane;
+  }
   public VariableNameInjector getVariableNameInjector() {
     return this.variableNameInjector;
+  }
   public void setVariableNameInjector( final VariableNameInjector injector ) {
     this.variableNameInjector = injector;
+  }
   private Options getOptions() {
     return this.options;
+  }
   public MenuBar getMenuBar() {
     return this.menuBar;
+  }
   public void setMenuBar( MenuBar menuBar ) {
     this.menuBar = menuBar;
+  }
   //---- Member creators ----------------------------------------------------
   private DefinitionSource createDefinitionSource( final Path path ) {
     return createDefinitionFactory().fileDefinitionSource( path );
+  }
   /**
    * Create an editor pane to hold file editor tabs.
+   *
    * @return A new instance, never null.
    */
   private FileEditorTabPane createFileEditorPane() {
     return new FileEditorTabPane();
+  }
   private HTMLPreviewPane createPreviewPane() {
     return new HTMLPreviewPane();
+  }
   protected DefinitionPane createDefinitionPane() {
     return new DefinitionPane( getTreeView() );
+  }
   private DefinitionFactory createDefinitionFactory() {
     return new DefinitionFactory();
+  }
   private Node createMenuBar() {
     final BooleanBinding activeFileEditorIsNull = getFileEditorPane().activeFileEditorProperty().isNull();
     // File actions
     Action fileNewAction = new Action( get( "Main.menu.file.new" ), "Shortcut+N", FILE_ALT, e -> fileNew() );
     Action fileOpenAction = new Action( get( "Main.menu.file.open" ), "Shortcut+O", FOLDER_OPEN_ALT, e -> fileOpen() );
     Action fileCloseAction = new Action( get( "Main.menu.file.close" ), "Shortcut+W", null, e -> fileClose(), activeFileEditorIsNull );
     Action fileCloseAllAction = new Action( get( "Main.menu.file.close_all" ), null, null, e -> fileCloseAll(), activeFileEditorIsNull );
     Action fileSaveAction = new Action( get( "Main.menu.file.save" ), "Shortcut+S", FLOPPY_ALT, e -> fileSave(),
       createActiveBooleanProperty( FileEditorTab::modifiedProperty ).not() );
     Action fileSaveAllAction = new Action( get( "Main.menu.file.save_all" ), "Shortcut+Shift+S", null, e -> fileSaveAll(),
       Bindings.not( getFileEditorPane().anyFileEditorModifiedProperty() ) );
     Action fileExitAction = new Action( get( "Main.menu.file.exit" ), null, null, e -> fileExit() );
     // Edit actions
     Action editUndoAction = new Action( get( "Main.menu.edit.undo" ), "Shortcut+Z", UNDO,
       e -> getActiveEditor().undo(),
       createActiveBooleanProperty( FileEditorTab::canUndoProperty ).not() );
     Action editRedoAction = new Action( get( "Main.menu.edit.redo" ), "Shortcut+Y", REPEAT,
       e -> getActiveEditor().redo(),
       createActiveBooleanProperty( FileEditorTab::canRedoProperty ).not() );
     // Insert actions
     Action insertBoldAction = new Action( get( "Main.menu.insert.bold" ), "Shortcut+B", BOLD,
       e -> getActiveEditor().surroundSelection( "**", "**" ),
       activeFileEditorIsNull );
     Action insertItalicAction = new Action( get( "Main.menu.insert.italic" ), "Shortcut+I", ITALIC,
       e -> getActiveEditor().surroundSelection( "*", "*" ),
       activeFileEditorIsNull );
     Action insertStrikethroughAction = new Action( get( "Main.menu.insert.strikethrough" ), "Shortcut+T", STRIKETHROUGH,
       e -> getActiveEditor().surroundSelection( "~~", "~~" ),
       activeFileEditorIsNull );
     Action insertBlockquoteAction = new Action( get( "Main.menu.insert.blockquote" ), "Ctrl+Q", QUOTE_LEFT, // not Shortcut+Q because of conflict on Mac
       e -> getActiveEditor().surroundSelection( "\n\n> ", "" ),
       activeFileEditorIsNull );
     Action insertCodeAction = new Action( get( "Main.menu.insert.code" ), "Shortcut+K", CODE,
       e -> getActiveEditor().surroundSelection( "`", "`" ),
       activeFileEditorIsNull );
     Action insertFencedCodeBlockAction = new Action( get( "Main.menu.insert.fenced_code_block" ), "Shortcut+Shift+K", FILE_CODE_ALT,
       e -> getActiveEditor().surroundSelection( "\n\n```\n", "\n```\n\n", get( "Main.menu.insert.fenced_code_block.prompt" ) ),
       activeFileEditorIsNull );
     Action insertLinkAction = new Action( get( "Main.menu.insert.link" ), "Shortcut+L", LINK,
       e -> getActiveEditor().insertLink(),
       activeFileEditorIsNull );
     Action insertImageAction = new Action( get( "Main.menu.insert.image" ), "Shortcut+G", PICTURE_ALT,
       e -> getActiveEditor().insertImage(),
       activeFileEditorIsNull );
     final Action[] headers = new Action[ 6 ];
     // Insert header actions (H1 ... H6)
     for( int i = 1; i <= 6; i++ ) {
       final String hashes = new String( new char[ i ] ).replace( "\0", "#" );
       final String markup = String.format( "\n\n%s ", hashes );
       final String text = get( "Main.menu.insert.header_" + i );
       final String accelerator = "Shortcut+" + i;
       final String prompt = get( "Main.menu.insert.header_" + i + ".prompt" );
       headers[ i - 1 ] = new Action( text, accelerator, HEADER,
         e -> getActiveEditor().surroundSelection( markup, "", prompt ),
         activeFileEditorIsNull );
+    }
     Action insertUnorderedListAction = new Action( get( "Main.menu.insert.unordered_list" ), "Shortcut+U", LIST_UL,
       e -> getActiveEditor().surroundSelection( "\n\n* ", "" ),
       activeFileEditorIsNull );
     Action insertOrderedListAction = new Action( get( "Main.menu.insert.ordered_list" ), "Shortcut+Shift+O", LIST_OL,
       e -> getActiveEditor().surroundSelection( "\n\n1. ", "" ),
       activeFileEditorIsNull );
     Action insertHorizontalRuleAction = new Action( get( "Main.menu.insert.horizontal_rule" ), "Shortcut+H", null,
       e -> getActiveEditor().surroundSelection( "\n\n---\n\n", "" ),
       activeFileEditorIsNull );
     // Help actions
     Action helpAboutAction = new Action( get( "Main.menu.help.about" ), null, null, e -> helpAbout() );
     //---- MenuBar ----
     Menu fileMenu = ActionUtils.createMenu( get( "Main.menu.file" ),
       fileNewAction,
       fileOpenAction,
       null,
       fileCloseAction,
       fileCloseAllAction,
       null,
       fileSaveAction,
       fileSaveAllAction,
       null,
       fileExitAction );
     Menu editMenu = ActionUtils.createMenu( get( "Main.menu.edit" ),
       editUndoAction,
       editRedoAction );
     Menu insertMenu = ActionUtils.createMenu( get( "Main.menu.insert" ),
       insertBoldAction,
       insertItalicAction,
       insertStrikethroughAction,
       insertBlockquoteAction,
       insertCodeAction,
       insertFencedCodeBlockAction,
       null,
       insertLinkAction,
       insertImageAction,
       null,
       headers[ 0 ],
       headers[ 1 ],
       headers[ 2 ],
       headers[ 3 ],
       headers[ 4 ],
       headers[ 5 ],
       null,
       insertUnorderedListAction,
       insertOrderedListAction,
       insertHorizontalRuleAction );
     Menu helpMenu = ActionUtils.createMenu( get( "Main.menu.help" ),
       helpAboutAction );
     menuBar = new MenuBar( fileMenu, editMenu, insertMenu, helpMenu );
     //---- ToolBar ----
     ToolBar toolBar = ActionUtils.createToolBar(
       fileNewAction,
       fileOpenAction,
       fileSaveAction,
       null,
       editUndoAction,
       editRedoAction,
       null,
       insertBoldAction,
       insertItalicAction,
       insertBlockquoteAction,
       insertCodeAction,
       insertFencedCodeBlockAction,
       null,
       insertLinkAction,
       insertImageAction,
       null,
       headers[ 0 ],
       null,
       insertUnorderedListAction,
       insertOrderedListAction );
     return new VBox( menuBar, toolBar );
+  }
   private void initLayout() {
     final SplitPane splitPane = new SplitPane(
       getDefinitionPane().getNode(),
       getFileEditorPane().getNode(),
       getPreviewPane().getNode() );
     splitPane.setDividerPositions(
       getFloat( K_PANE_SPLIT_DEFINITION, .10f ),
       getFloat( K_PANE_SPLIT_EDITOR, .45f ),
       getFloat( K_PANE_SPLIT_PREVIEW, .45f ) );
     // See: http://broadlyapplicable.blogspot.ca/2015/03/javafx-capture-restorePreferences-splitpane.html
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setCenter( splitPane );
     final Scene appScene = new Scene( borderPane );
     setScene( appScene );
     appScene.getStylesheets().add( STYLESHEET_SCENE );
     appScene.windowProperty().addListener(
       (observable, oldWindow, newWindow) -> {
         newWindow.setOnCloseRequest( e -> {
           if( !getFileEditorPane().closeAllEditors() ) {
             e.consume();
+          }
         } );
         // Workaround JavaFX bug: deselect menubar if window loses focus.
         newWindow.focusedProperty().addListener(
           (obs, oldFocused, newFocused) -> {
             if( !newFocused ) {
               // Send an ESC key event to the menubar
               this.menuBar.fireEvent(
                 new KeyEvent(
                   KEY_PRESSED, CHAR_UNDEFINED, "", ESCAPE,
                   false, false, false, false ) );
+            }
+          }
         );
+      }
     );
+  }
+}

A src/main/java/com/scrivenvar/Messages.java

 /*
  * Copyright (c) 2016 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  * Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  * Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 import java.util.Stack;
 import static com.scrivenvar.Constants.APP_BUNDLE_NAME;
 /**
  * Recursively resolves message properties. Property values can refer to other
  * properties using a <code>${var}</code> syntax.
+ *
  * @author Karl Tauber, Dave Jarvis
  */
 public class Messages {
   private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(APP_BUNDLE_NAME );
   private Messages() {
+  }
   /**
    * Return the value of a resource bundle value after having resolved any
    * references to other bundle variables.
+   *
    * @param props The bundle containing resolvable properties.
    * @param s The value for a key to resolve.
+   *
    * @return The value of the key with all references recursively dereferenced.
    */
   private static String resolve( ResourceBundle props, String s ) {
     final int len = s.length();
     final Stack<StringBuilder> stack = new Stack<>();
     StringBuilder sb = new StringBuilder( 256 );
     boolean open = false;
     for( int i = 0; i < len; i++ ) {
       final char c = s.charAt( i );
       switch( c ) {
         case '$': {
           if( i + 1 < len && s.charAt( i + 1 ) == '{' ) {
             stack.push( sb );
             sb = new StringBuilder( 256 );
             i++;
             open = true;
+          }
           break;
+        }
         case '}': {
           if( open ) {
             open = false;
             final String name = sb.toString();
             sb = stack.pop();
             sb.append( props.getString( name ) );
             break;
+          }
+        }
         default: {
           sb.append( c );
           break;
+        }
+      }
+    }
     if( open ) {
       throw new IllegalArgumentException( "missing '}'" );
+    }
     return sb.toString();
+  }
   /**
    * Returns the value for a key from the message bundle.
+   *
    * @param key Retrieve the value for this key.
+   *
    * @return The value for the key.
    */
   public static String get( String key ) {
     String result;
     try {
       result = resolve( RESOURCE_BUNDLE, RESOURCE_BUNDLE.getString( key ) );
     } catch( Exception e ) {
       // Instead of crashing, launch the application and show the resource
       // name.
       result = key;
+    }
     return result;
+  }
   /**
    * Returns the value for a key from the message bundle with the arguments
    * replacing <code>{#}</code> place holders.
+   *
    * @param key Retrieve the value for this key.
    * @param args The values to substitute for place holders.
+   *
    * @return The value for the key.
    */
   public static String get( String key, Object... args ) {
     return MessageFormat.format( get( key ), args );
+  }
+}

A src/main/java/com/scrivenvar/Services.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar;
 import java.util.ServiceLoader;
 /**
  * Responsible for loading services.
+ *
  * @author White Magic Software, Ltd.
  */
 public class Services {
   /**
    * Loads a service based on its interface definition.
+   *
    * @param <T> The service to load.
    * @param api The interface definition for the service.
+   *
    * @return A class that implements the interface.
    */
   public static <T> T load( Class<T> api ) {
     final ServiceLoader<T> services = ServiceLoader.load( api );
     T result = null;
     for( T service : services ) {
       result = service;
       if( result != null ) {
         break;
+      }
+    }
     if( result == null ) {
       throw new RuntimeException( "No implementation for: " + api );
+    }
     return result;
+  }
+}

A src/main/java/com/scrivenvar/controls/BrowseDirectoryButton.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import java.io.File;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Tooltip;
 import javafx.stage.DirectoryChooser;
 import com.scrivenvar.Messages;
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
 import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
 /**
  * Button that opens a directory chooser to select a local directory for a URL in markdown.
+ *
  * @author Karl Tauber
  */
 public class BrowseDirectoryButton
 	extends BrowseFileButton
+{
 	public BrowseDirectoryButton() {
 		setGraphic(FontAwesomeIconFactory.get().createIcon(FontAwesomeIcon.FOLDER_ALT, "1.2em"));
 		setTooltip(new Tooltip(Messages.get("BrowseDirectoryButton.tooltip")));
+	}
 	@Override
 	protected void browse(ActionEvent e) {
 		DirectoryChooser directoryChooser = new DirectoryChooser();
 		directoryChooser.setTitle(Messages.get("BrowseDirectoryButton.chooser.title"));
 		directoryChooser.setInitialDirectory(getInitialDirectory());
 		File result = directoryChooser.showDialog(getScene().getWindow());
 		if (result != null)
 			updateUrl(result);
+	}
+}

A src/main/java/com/scrivenvar/controls/BrowseFileButton.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
 import com.scrivenvar.Messages;
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
 import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
 /**
  * Button that opens a file chooser to select a local file for a URL in markdown.
+ *
  * @author Karl Tauber
  */
 public class BrowseFileButton
 	extends Button
+{
 	private final List<ExtensionFilter> extensionFilters = new ArrayList<>();
 	public BrowseFileButton() {
 		setGraphic(FontAwesomeIconFactory.get().createIcon(FontAwesomeIcon.FILE_ALT, "1.2em"));
 		setTooltip(new Tooltip(Messages.get("BrowseFileButton.tooltip")));
 		setOnAction(this::browse);
 		disableProperty().bind(basePath.isNull());
 		// workaround for a JavaFX bug:
 		//   avoid closing the dialog that contains this control when the user
 		//   closes the FileChooser or DirectoryChooser using the ESC key
 		addEventHandler(KeyEvent.KEY_RELEASED, e-> {
 			if (e.getCode() == KeyCode.ESCAPE)
 				e.consume();
 		});
+	}
 	public void addExtensionFilter(ExtensionFilter extensionFilter) {
 		extensionFilters.add(extensionFilter);
+	}
 	// 'basePath' property
 	private final ObjectProperty<Path> basePath = new SimpleObjectProperty<>();
 	public Path getBasePath() { return basePath.get(); }
 	public void setBasePath(Path basePath) { this.basePath.set(basePath); }
 	public ObjectProperty<Path> basePathProperty() { return basePath; }
 	// 'url' property
 	private final ObjectProperty<String> url = new SimpleObjectProperty<>();
 	public String getUrl() { return url.get(); }
 	public void setUrl(String url) { this.url.set(url); }
 	public ObjectProperty<String> urlProperty() { return url; }
 	protected void browse(ActionEvent e) {
 		FileChooser fileChooser = new FileChooser();
 		fileChooser.setTitle(Messages.get("BrowseFileButton.chooser.title"));
 		fileChooser.getExtensionFilters().addAll(extensionFilters);
 		fileChooser.getExtensionFilters().add(new ExtensionFilter(Messages.get("BrowseFileButton.chooser.allFilesFilter"), "*.*"));
 		fileChooser.setInitialDirectory(getInitialDirectory());
 		File result = fileChooser.showOpenDialog(getScene().getWindow());
 		if (result != null)
 			updateUrl(result);
+	}
 	protected File getInitialDirectory() {
 		//TODO build initial directory based on current value of 'url' property
 		return getBasePath().toFile();
+	}
 	protected void updateUrl(File file) {
 		String newUrl;
 		try {
 			newUrl = getBasePath().relativize(file.toPath()).toString();
 		} catch (IllegalArgumentException ex) {
 			newUrl = file.toString();
+		}
 		url.set(newUrl.replace('\\', '/'));
+	}
+}

A src/main/java/com/scrivenvar/controls/EscapeTextField.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.TextField;
 import javafx.util.StringConverter;
 import com.scrivenvar.util.Utils;
 /**
  * TextField that can escape/unescape characters for markdown.
+ *
  * @author Karl Tauber
  */
 public class EscapeTextField
 	extends TextField
+{
 	public EscapeTextField() {
 		escapedText.bindBidirectional(textProperty(), new StringConverter<String>() {
 			@Override public String toString(String object) { return escape(object); }
 			@Override public String fromString(String string) { return unescape(string); }
 		});
 		escapeCharacters.addListener(e -> escapedText.set(escape(textProperty().get())));
+	}
 	// 'escapedText' property
 	private final StringProperty escapedText = new SimpleStringProperty();
 	public String getEscapedText() { return escapedText.get(); }
 	public void setEscapedText(String escapedText) { this.escapedText.set(escapedText); }
 	public StringProperty escapedTextProperty() { return escapedText; }
 	// 'escapeCharacters' property
 	private final StringProperty escapeCharacters = new SimpleStringProperty();
 	public String getEscapeCharacters() { return escapeCharacters.get(); }
 	public void setEscapeCharacters(String escapeCharacters) { this.escapeCharacters.set(escapeCharacters); }
 	public StringProperty escapeCharactersProperty() { return escapeCharacters; }
 	private String escape(String s) {
 		String escapeChars = getEscapeCharacters();
 		return !Utils.isNullOrEmpty(escapeChars)
 				? s.replaceAll("([" + escapeChars.replaceAll("(.)", "\\\\$1") + "])", "\\\\$1")
 				: s;
+	}
 	private String unescape(String s) {
 		String escapeChars = getEscapeCharacters();
 		return !Utils.isNullOrEmpty(escapeChars)
 				? s.replaceAll("\\\\([" + escapeChars.replaceAll("(.)", "\\\\$1") + "])", "$1")
 				: s;
+	}
+}

A src/main/java/com/scrivenvar/controls/FlagCheckBox.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.scene.control.CheckBox;
 /**
  * CheckBox that toggles a bit in an integer.
+ *
  * @author Karl Tauber
  */
 public class FlagCheckBox extends CheckBox {
   public FlagCheckBox() {
     setOnAction( e -> {
       if( isSelected() ) {
         setFlags( getFlags() | getFlag() );
       } else {
         setFlags( getFlags() & ~getFlag() );
+      }
     } );
     flags.addListener( (obs, oldFlags, newFlags) -> {
       setSelected( (newFlags.intValue() & getFlag()) != 0 );
     } );
+  }
   // 'flag' property
   private final IntegerProperty flag = new SimpleIntegerProperty();
   public int getFlag() {
     return flag.get();
+  }
   public void setFlag( int flag ) {
     this.flag.set( flag );
+  }
   public IntegerProperty flagProperty() {
     return flag;
+  }
   // 'flags' property
   private final IntegerProperty flags = new SimpleIntegerProperty();
   public int getFlags() {
     return flags.get();
+  }
   public void setFlags( int flags ) {
     this.flags.set( flags );
+  }
   public IntegerProperty flagsProperty() {
     return flags;
+  }
+}

A src/main/java/com/scrivenvar/controls/WebHyperlink.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.controls;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.Hyperlink;
 import com.scrivenvar.Main;
 /**
  * Opens a web site in the default web browser.
+ *
  * @author Karl Tauber
  */
 public class WebHyperlink
 	extends Hyperlink
+{
 	public WebHyperlink() {
 		setStyle("-fx-padding: 0; -fx-border-width: 0");
+	}
 	@Override
 	public void fire() {
 		Main.showDocument(getUri());
+	}
 	// 'uri' property
 	private final StringProperty uri = new SimpleStringProperty();
 	public String getUri() { return uri.get(); }
 	public void setUri(String uri) { this.uri.set(uri); }
 	public StringProperty UriProperty() { return uri; }
+}

A src/main/java/com/scrivenvar/decorators/RVariableDecorator.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.decorators;
 /**
  * Brackets variable names with <code>`r#</code> and <code>`</code>.
+ *
  * @author White Magic Software, Ltd.
  */
 public class RVariableDecorator implements VariableDecorator {
   /**
    * Returns the given string R-escaping backticks prepended and appended. This
    * is not null safe. Do not pass null into this method.
+   *
    * @param variableName The string to decorate.
+   *
    * @return "`r#" + variableName + "`".
    */
   @Override
   public String decorate( final String variableName ) {
     return "`r#" + variableName + "`";
+  }
+}

A src/main/java/com/scrivenvar/decorators/VariableDecorator.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.decorators;
 /**
  * Responsible for updating variable names to use a machine-readable format
  * corresponding to the type of file being edited.
  */
 public interface VariableDecorator {
   /**
    * This decorates a variable name based on some criteria determined by the
    * factory that creates implementations of this interface.
+   *
    * @param variableName The text to decorate as per the filename extension
    * would indicate (e.g., ".md" goes to $VAR$ while ".Rmd" goes to `r#VAR`).
+   *
    * @return The given variable name modified with its requisite delimiters.
    */
   public String decorate( String variableName );
+}

A src/main/java/com/scrivenvar/decorators/YamlVariableDecorator.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.decorators;
 /**
  * Brackets variable names with dollar symbols.
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlVariableDecorator implements VariableDecorator {
   /**
    * Matches variables delimited by dollar symbols. The outer group is necessary
    * for substring replacement of delimited references.
    */
   public final static String REGEX = "(\\$(.*?)\\$)";
   /**
    * Returns the given string with a $ symbol prepended and appended. This is
    * not null safe. Do not pass null into this method.
+   *
    * @param variableName The string to decorate.
+   *
    * @return "$" + variableName + "$".
    */
   @Override
   public String decorate( final String variableName ) {
     return "$" + variableName + "$";
+  }
+}

A src/main/java/com/scrivenvar/definition/AbstractDefinitionSource.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 /**
  * Implements common behaviour for definition sources.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class AbstractDefinitionSource implements DefinitionSource {
+}

A src/main/java/com/scrivenvar/definition/DefinitionFactory.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import com.scrivenvar.Services;
 import com.scrivenvar.definition.yaml.YamlFileDefinitionSource;
 import com.scrivenvar.predicates.files.FileTypePredicate;
 import com.scrivenvar.service.Settings;
 import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.List;
 /**
  * Responsible for creating objects that can read and write definition data
  * sources. The data source could be YAML, TOML, JSON, flat files, or from a
  * database.
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefinitionFactory {
   /**
    * Refers to filename extension settings in the configuration file. Do not
    * terminate this key prefix with a period.
    */
   private static final String EXTENSIONS_PREFIX = "file.ext.definition";
   private final Settings settings = Services.load( Settings.class );
   /**
    * Default (empty) constructor.
    */
   public DefinitionFactory() {
+  }
   /**
    * Creates a definition source that can read and write files that match the
    * given file type (from the path).
+   *
    * @param path Reference to a variable definition file.
+   *
    * @return
    */
   public DefinitionSource fileDefinitionSource( final Path path ) {
     final Settings properties = getSettings();
     final Iterator<String> keys = properties.getKeys( EXTENSIONS_PREFIX );
     DefinitionSource definitions = null;
     while( keys.hasNext() ) {
       final String key = keys.next();
       final List<String> patterns = properties.getStringSettingList( key );
       final FileTypePredicate predicate = new FileTypePredicate( patterns );
       if( predicate.test( path.toFile() ) ) {
         final String filetype = key.replace( EXTENSIONS_PREFIX + ".", "" );
         definitions = createFileDefinitionSource( filetype, path );
+      }
+    }
     return definitions;
+  }
   /**
    * Creates a definition source based on the file type.
+   *
    * @param filetype Property key name suffix from settings.properties file.
    * @param path Path to the file that corresponds to the extension.
+   *
    * @return A DefinitionSource capable of parsing the data stored at the path.
    */
   private DefinitionSource createFileDefinitionSource(
     final String filetype, final Path path ) {
     final DefinitionSource result;
     switch( filetype ) {
       case "yaml":
         result = new YamlFileDefinitionSource( path );
         break;
       default:
         result = new EmptyDefinitionSource();
         break;
+    }
     return result;
+  }
   private Settings getSettings() {
     return this.settings;
+  }
+}

A src/main/java/com/scrivenvar/definition/DefinitionPane.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import com.scrivenvar.AbstractPane;
 import static com.scrivenvar.definition.yaml.YamlParser.SEPARATOR;
 import com.scrivenvar.predicates.strings.ContainsPredicate;
 import com.scrivenvar.predicates.strings.StartsPredicate;
 import com.scrivenvar.predicates.strings.StringPredicate;
 import static com.scrivenvar.util.Lists.getFirst;
 import java.util.List;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 /**
  * Provides a list of variables that can be referenced in the editor.
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefinitionPane extends AbstractPane {
   /**
    * Trimmed off the end of a word to match a variable name.
    */
   private final static String TERMINALS = ":;,.!?-/\\¡¿";
   private TreeView<String> treeView;
   /**
    * Constructs a definition pane with a given tree view root.
+   *
    * @see YamlTreeAdapter.adapt
    * @param root The root of the variable definition tree.
    */
   public DefinitionPane( final TreeView<String> root ) {
     setTreeView( root );
     initTreeView();
+  }
   public void clear() {
     getTreeView().setRoot( null );
+  }
   /**
    * Finds a tree item with a value that exactly matches the given word.
+   *
    * @param trunk The root item containing a list of nodes to search.
    * @param word The value of the item to find.
    * @param predicate Helps determine whether the node value matches the word.
+   *
    * @return The item that matches the given word, or null if not found.
    */
   private TreeItem<String> findNode(
     final TreeItem<String> trunk,
     final StringPredicate predicate ) {
     final List<TreeItem<String>> branches = trunk.getChildren();
     TreeItem<String> result = null;
     for( final TreeItem<String> leaf : branches ) {
       if( predicate.test( leaf.getValue() ) ) {
         result = leaf;
         break;
+      }
+    }
     return result;
+  }
   /**
    * Calls findNode with the EqualsPredicate.
+   *
    * @see findNode( TreeItem, String, Predicate )
    * @return The result from findNode.
    */
   private TreeItem<String> findStartsNode(
     final TreeItem<String> trunk,
     final String word ) {
     return findNode( trunk, new StartsPredicate( word ) );
+  }
   /**
    * Calls findNode with the ContainsPredicate.
+   *
    * @see findNode( TreeItem, String, Predicate )
    * @return The result from findNode.
    */
   private TreeItem<String> findSubstringNode(
     final TreeItem<String> trunk,
     final String word ) {
     return findNode( trunk, new ContainsPredicate( word ) );
+  }
   /**
    * Finds a node that matches a prefix and suffix specified by the given path
    * variable. The prefix must match a valid node value. The suffix refers to
    * the start of a string that matches zero or more children of the node
    * specified by the prefix. The algorithm has the following cases:
+   *
    * <ol>
    * <li>Path is empty, return first child.</li>
    * <li>Path contains a complete match, return corresponding node.</li>
    * <li>Path contains a partial match, return nearest node.</li>
    * <li>Path contains a complete and partial match, return nearest node.</li>
    * </ol>
+   *
    * @param word The word typed by the user, which contains dot-separated node
    * names that represent a path within the YAML tree plus a partial variable
    * name match (for a node).
+   *
    * @return The node value that starts with the suffix portion of the given
    * path, never null.
    */
   public TreeItem<String> findNode( final String word ) {
     String path = word;
     TreeItem<String> cItem = getTreeRoot();
     TreeItem<String> pItem = cItem;
     int index = path.indexOf( SEPARATOR );
     while( index >= 0 ) {
       final String node = path.substring( 0, index );
       path = path.substring( index + 1 );
       if( (cItem = findStartsNode( cItem, node )) == null ) {
         break;
+      }
       index = path.indexOf( SEPARATOR );
       pItem = cItem;
+    }
     // Find the node that starts with whatever the user typed.
     cItem = findStartsNode( pItem, path );
     // If there was no matching node, then find a substring match.
     if( cItem == null ) {
       cItem = findSubstringNode( pItem, path );
+    }
     // If neither starts with nor substring matched a node, revert to the last
     // known valid node.
     if( cItem == null ) {
       cItem = pItem;
+    }
     return sanitize( cItem );
+  }
   /**
    * Returns the leaf that matches the given value. If the value is terminally
    * punctuated, the punctuation is removed if no match was found.
+   *
    * @param value The value to find, never null.
+   *
    * @return The leaf that contains the given value, or null if neither the
    * original value nor the terminally-trimmed value was found.
    */
   public VariableTreeItem<String> findLeaf( final String value ) {
     final VariableTreeItem<String> root = getTreeRoot();
     final VariableTreeItem<String> leaf = root.findLeaf( value );
     return leaf == null
       ? root.findLeaf( rtrimTerminalPunctuation( value ) )
       : leaf;
+  }
   /**
    * Removes punctuation from the end of a string. The character set includes:
    * <code>:;,.!?-/\¡¿</code>.
+   *
    * @param s The string to trim, never null.
+   *
    * @return The string trimmed of all terminal characters from the end
    */
   private String rtrimTerminalPunctuation( final String s ) {
     final StringBuilder result = new StringBuilder( s.trim() );
     while( TERMINALS.contains( "" + result.charAt( result.length() - 1 ) ) ) {
       result.setLength( result.length() - 1 );
+    }
     return result.toString();
+  }
   /**
    * Returns the tree root if either item or its first child are null.
+   *
    * @param item The item to make null safe.
+   *
    * @return A non-null TreeItem, possibly the root item (to avoid null).
    */
   private TreeItem<String> sanitize( final TreeItem<String> item ) {
     final TreeItem<String> result = item == getTreeRoot()
       ? getFirst( item.getChildren() )
       : item;
     return result == null ? item : result;
+  }
   /**
    * Expands the node to the root, recursively.
+   *
    * @param <T> The type of tree item to expand (usually String).
    * @param node The node to expand.
    */
   public <T> void expand( final TreeItem<T> node ) {
     if( node != null ) {
       expand( node.getParent() );
       if( !node.isLeaf() ) {
         node.setExpanded( true );
+      }
+    }
+  }
   public void select( final TreeItem<String> item ) {
     clearSelection();
     selectItem( getTreeView().getRow( item ) );
+  }
   private void clearSelection() {
     getSelectionModel().clearSelection();
+  }
   private void selectItem( final int row ) {
     getSelectionModel().select( row );
+  }
   /**
    * Collapses the tree, recursively.
    */
   public void collapse() {
     collapse( getTreeRoot().getChildren() );
+  }
   /**
    * Collapses the tree, recursively.
+   *
    * @param <T> The type of tree item to expand (usually String).
    * @param node The nodes to collapse.
    */
   private <T> void collapse( ObservableList<TreeItem<T>> nodes ) {
     for( final TreeItem<T> node : nodes ) {
       node.setExpanded( false );
       collapse( node.getChildren() );
+    }
+  }
   private void initTreeView() {
     getSelectionModel().setSelectionMode( SelectionMode.MULTIPLE );
+  }
   /**
    * Returns the root node to the tree view.
+   *
    * @return getTreeView()
    */
   public Node getNode() {
     return getTreeView();
+  }
   private MultipleSelectionModel getSelectionModel() {
     return getTreeView().getSelectionModel();
+  }
   /**
    * Returns the tree view that contains the YAML definition hierarchy.
+   *
    * @return A non-null instance.
    */
   private TreeView<String> getTreeView() {
     return this.treeView;
+  }
   /**
    * Returns the root of the tree.
+   *
    * @return The first node added to the YAML definition tree.
    */
   private VariableTreeItem<String> getTreeRoot() {
     return (VariableTreeItem<String>)getTreeView().getRoot();
+  }
   public <T> boolean isRoot( final TreeItem<T> item ) {
     return getTreeRoot().equals( item );
+  }
   /**
    * Sets the tree view (called by the constructor).
+   *
    * @param treeView
    */
   private void setTreeView( TreeView<String> treeView ) {
     if( treeView != null ) {
       this.treeView = treeView;
+    }
+  }
+}

A src/main/java/com/scrivenvar/definition/DefinitionSource.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import java.io.IOException;
 import java.util.Map;
 import javafx.scene.control.TreeView;
 /**
  * Represents behaviours for reading and writing variable definitions.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface DefinitionSource {
   /**
    * Creates a TreeView from this definition source. The definition source is
    * responsible for observing the TreeView instance for changes and persisting
    * them, if needed.
+   *
    * @return A hierarchical tree suitable for displaying in the definition pane.
+   *
    * @throws IOException Could not obtain the definition source data.
    */
   public TreeView<String> asTreeView() throws IOException;
   /**
    * Returns all the strings with their values resolved in a flat hierarchy.
    * This copies all the keys and resolved values into a new map.
+   *
    * @return The new map created with all values having been resolved,
    * recursively.
    */
   public Map<String, String> getResolvedMap();
+}

A src/main/java/com/scrivenvar/definition/EmptyDefinitionSource.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import javafx.scene.control.TreeView;
 /**
  * Creates a definition source that has no information to load or save.
+ *
  * @author White Magic Software, Ltd.
  */
 public class EmptyDefinitionSource extends AbstractDefinitionSource {
   public EmptyDefinitionSource() {
+  }
   @Override
   public TreeView<String> asTreeView() throws IOException {
     return new TreeView<>();
+  }
   @Override
   public Map<String, String> getResolvedMap() {
     return new HashMap<>();
+  }
+}

A src/main/java/com/scrivenvar/definition/VariableTreeItem.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition;
 import com.scrivenvar.decorators.VariableDecorator;
 import com.scrivenvar.decorators.YamlVariableDecorator;
 import static com.scrivenvar.definition.yaml.YamlParser.SEPARATOR;
 import static com.scrivenvar.editors.VariableNameInjector.DEFAULT_MAX_VAR_LENGTH;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
 import javafx.scene.control.TreeItem;
 /**
  * Provides behaviour afforded to variable names and their corresponding value.
+ *
  * @author White Magic Software, Ltd.
  * @param <T> The type of TreeItem (usually String).
  */
 public class VariableTreeItem<T> extends TreeItem<T> {
   private final static int DEFAULT_MAP_SIZE = 1000;
   private final static VariableDecorator VARIABLE_DECORATOR =
     new YamlVariableDecorator();
   /**
    * Flattened tree.
    */
   private Map<String, String> map;
   /**
    * Constructs a new item with a default value.
+   *
    * @param value Passed up to superclass.
    */
   public VariableTreeItem( final T value ) {
     super( value );
+  }
   /**
    * Finds a leaf starting at the current node with text that matches the given
    * value.
+   *
    * @param text The text to match against each leaf in the tree.
+   *
    * @return The leaf that has a value starting with the given text.
    */
   public VariableTreeItem<T> findLeaf( final String text ) {
     final Stack<VariableTreeItem<T>> stack = new Stack<>();
     final VariableTreeItem<T> root = this;
     stack.push( root );
     boolean found = false;
     VariableTreeItem<T> node = null;
     while( !found && !stack.isEmpty() ) {
       node = stack.pop();
       if( node.valueStartsWith( text ) ) {
         found = true;
       } else {
         for( final TreeItem<T> child : node.getChildren() ) {
           stack.push( (VariableTreeItem<T>)child );
+        }
         // No match found, yet.
         node = null;
+      }
+    }
     return (VariableTreeItem<T>)node;
+  }
   /**
    * Returns true if this node is a leaf and its value starts with the given
    * text.
+   *
    * @param s The text to compare against the node value.
+   *
    * @return true Node is a leaf and its value starts with the given value.
    */
   private boolean valueStartsWith( final String s ) {
     return isLeaf() && getValue().toString().startsWith( s );
+  }
   /**
    * Returns the path for this node, with nodes made distinct using the
    * separator character. This uses two loops: one for pushing nodes onto a
    * stack and one for popping them off to create the path in desired order.
+   *
    * @return A non-null string, possibly empty.
    */
   public String toPath() {
     final Stack<TreeItem<T>> stack = new Stack<>();
     TreeItem<T> node = this;
     while( node.getParent() != null ) {
       stack.push( node );
       node = node.getParent();
+    }
     final StringBuilder sb = new StringBuilder( DEFAULT_MAX_VAR_LENGTH );
     while( !stack.isEmpty() ) {
       node = stack.pop();
       if( !node.isLeaf() ) {
         sb.append( node.getValue() );
         // This will add a superfluous separator, but instead of peeking at
         // the stack all the time, the last separator will be removed outside
         // the loop (one operation executed once).
         sb.append( SEPARATOR );
+      }
+    }
     // Remove the trailing SEPARATOR.
     if( sb.length() > 0 ) {
       sb.setLength( sb.length() - 1 );
+    }
     return sb.toString();
+  }
   /**
    * Returns the hierarchy, flattened to key-value pairs.
+   *
    * @return A map of this tree's key-value pairs.
    */
   public Map<String, String> getMap() {
     if( this.map == null ) {
       this.map = new HashMap<>( DEFAULT_MAP_SIZE );
       populate( this, this.map );
+    }
     return this.map;
+  }
   private void populate( final TreeItem<T> parent, final Map<String, String> map ) {
     for( final TreeItem<T> child : parent.getChildren() ) {
       if( child.isLeaf() ) {
         @SuppressWarnings( "unchecked" )
         final String key = toVariable( ((VariableTreeItem<String>)child).toPath() );
         final String value = child.getValue().toString();
         map.put( key, value );
       } else {
         populate( child, map );
+      }
+    }
+  }
   /**
    * Converts the name of the key to a simple variable by enclosing it with
    * dollar symbols.
+   *
    * @param key The key name to change to a variable.
+   *
    * @return $key$
    */
   public String toVariable( final String key ) {
     return VARIABLE_DECORATOR.decorate( key );
+  }
+}

A src/main/java/com/scrivenvar/definition/yaml/FileDefinitionSource.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition.yaml;
 import com.scrivenvar.definition.AbstractDefinitionSource;
 import java.nio.file.Path;
 /**
  * Implements common behaviour for file definition sources.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class FileDefinitionSource extends AbstractDefinitionSource {
   private Path path;
   /**
    * Constructs a new file definition source that can read and write data in the
    * hierarchical format contained within the file location specified by the
    * path.
+   *
    * @param path Must not be null.
    */
   public FileDefinitionSource( final Path path ) {
     setPath( path );
+  }
   private void setPath( final Path path ) {
     this.path = path;
+  }
   protected Path getPath() {
     return this.path;
+  }
   /**
    * Returns the path represented by this object.
+   *
    * @return The
    */
   @Override
   public String toString() {
     return getPath().toString();
+  }
+}

A src/main/java/com/scrivenvar/definition/yaml/YamlFileDefinitionSource.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition.yaml;
 import static com.scrivenvar.Messages.get;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 import javafx.scene.control.TreeView;
 /**
  * Represents a definition data source for YAML files.
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlFileDefinitionSource extends FileDefinitionSource {
   private YamlTreeAdapter yamlTreeAdapter;
   private YamlParser yamlParser;
   /**
    * Constructs a new YAML definition source, populated from the given file.
+   *
    * @param path Path to the YAML definition file.
    */
   public YamlFileDefinitionSource( final Path path ) {
     super( path );
+  }
   /**
    * TODO: Associate variable file with path to current file.
+   *
    * @return The TreeView for this definition source.
+   *
    * @throws IOException
    */
   @Override
   public TreeView<String> asTreeView() throws IOException {
     try( final InputStream in = Files.newInputStream( getPath() ) ) {
       return getYamlTreeAdapter().adapt(
         in,
         get( "Pane.defintion.node.root.title" )
       );
+    }
+  }
   @Override
   public Map<String, String> getResolvedMap() {
     return getYamlParser().createResolvedMap();
+  }
   private YamlTreeAdapter getYamlTreeAdapter() {
     if( this.yamlTreeAdapter == null ) {
       setYamlTreeAdapter( new YamlTreeAdapter( getYamlParser() ) );
+    }
     return this.yamlTreeAdapter;
+  }
   private void setYamlTreeAdapter( final YamlTreeAdapter yamlTreeAdapter ) {
     this.yamlTreeAdapter = yamlTreeAdapter;
+  }
   private YamlParser getYamlParser() {
     if( this.yamlParser == null ) {
       setYamlParser( new YamlParser() );
+    }
     return this.yamlParser;
+  }
   private void setYamlParser( final YamlParser yamlParser ) {
     this.yamlParser = yamlParser;
+  }
   private InputStream asStream( final String resource ) {
     return getClass().getResourceAsStream( resource );
+  }
+}

A src/main/java/com/scrivenvar/definition/yaml/YamlParser.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition.yaml;
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import com.scrivenvar.decorators.VariableDecorator;
 import com.scrivenvar.decorators.YamlVariableDecorator;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Writer;
 import java.security.InvalidParameterException;
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.yaml.snakeyaml.DumperOptions;
 /**
  * <p>
  * This program loads a YAML document into memory, scans for variable
  * declarations, then substitutes any self-referential values back into the
  * document. Its output is the given YAML document without any variables.
  * Variables in the YAML document are denoted using a bracketed dollar symbol
  * syntax. For example: $field.name$. Some nomenclature to keep from going
  * squirrely, consider:
  * </p>
+ *
  * <pre>
  *   root:
  *     node:
  *       name: $field.name$
  *   field:
  *     name: Alan Turing
  * </pre>
+ *
  * The various components of the given YAML are called:
+ *
  * <ul>
  * <li><code>$field.name$</code> - delimited reference</li>
  * <li><code>field.name</code> - reference</li>
  * <li><code>name</code> - YAML field</li>
  * <li><code>Alan Turing</code> - (dereferenced) field value</li>
  * </ul>
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlParser {
   /**
    * Separates YAML variable nodes (e.g., the dots in
    * <code>$root.node.var$</code>).
    */
   public static final String SEPARATOR = ".";
   private final static int GROUP_DELIMITED = 1;
   private final static int GROUP_REFERENCE = 2;
   private final static VariableDecorator VARIABLE_DECORATOR
     = new YamlVariableDecorator();
   /**
    * Compiled version of DEFAULT_REGEX.
    */
   private final static Pattern REGEX_PATTERN
     = Pattern.compile( YamlVariableDecorator.REGEX );
   /**
    * Should be JsonPointer.SEPARATOR, but Jackson YAML uses magic values.
    */
   private final static char SEPARATOR_YAML = '/';
   /**
    * Start of the Universe (the YAML document node that contains all others).
    */
   private ObjectNode documentRoot;
   /**
    * Map of references to dereferenced field values.
    */
   private Map<String, String> references;
   public YamlParser() {
+  }
   /**
    * Returns the given string with all the delimited references swapped with
    * their recursively resolved values.
+   *
    * @param text The text to parse with zero or more delimited references to
    * replace.
+   *
    * @return The substituted value.
    */
   public String substitute( String text ) {
     final Matcher matcher = patternMatch( text );
     final Map<String, String> map = getReferences();
     while( matcher.find() ) {
       final String key = matcher.group( GROUP_DELIMITED );
       final String value = map.get( key );
       if( value == null ) {
         missing( text );
       } else {
         text = text.replace( key, value );
+      }
+    }
     return text;
+  }
   /**
    * Returns all the strings with their values resolved in a flat hierarchy.
    * This copies all the keys and resolved values into a new map.
+   *
    * @return The new map created with all values having been resolved,
    * recursively.
    */
   public Map<String, String> createResolvedMap() {
     final Map<String, String> map = new HashMap<>( 1024 );
     resolve( getDocumentRoot(), "", map );
     return map;
+  }
   /**
    * Iterate over a given root node (at any level of the tree) and adapt each
    * leaf node.
+   *
    * @param rootNode A JSON node (YAML node) to adapt.
    */
   private void resolve(
     final JsonNode rootNode, final String path, final Map<String, String> map ) {
     rootNode.fields().forEachRemaining(
       (Entry<String, JsonNode> leaf) -> resolve( leaf, path, map )
     );
+  }
   /**
    * Recursively adapt each rootNode to a corresponding rootItem.
+   *
    * @param rootNode The node to adapt.
    */
   private void resolve(
     final Entry<String, JsonNode> rootNode,
     final String path,
     final Map<String, String> map ) {
     final JsonNode leafNode = rootNode.getValue();
     final String key = rootNode.getKey();
     if( leafNode.isValueNode() ) {
       final String value = rootNode.getValue().asText();
       map.put( VARIABLE_DECORATOR.decorate( path + key ), substitute( value ) );
+    }
     if( leafNode.isObject() ) {
       resolve( leafNode, path + key + SEPARATOR, map );
+    }
+  }
   /**
    * Reads the first document from the given stream of YAML data and returns a
    * corresponding object that represents the YAML hierarchy. The calling class
    * is responsible for closing the stream. Calling classes should use
    * <code>JsonNode.fields()</code> to walk through the YAML tree of fields.
+   *
    * @param in The input stream containing YAML content.
+   *
    * @return An object hierarchy to represent the content.
+   *
    * @throws IOException Could not read the stream.
    */
   public JsonNode process( final InputStream in ) throws IOException {
     final ObjectNode root = (ObjectNode)getObjectMapper().readTree( in );
     setDocumentRoot( root );
     process( root );
     return getDocumentRoot();
+  }
   /**
    * Iterate over a given root node (at any level of the tree) and process each
    * leaf node.
+   *
    * @param root A node to process.
    */
   private void process( final JsonNode root ) {
     root.fields().forEachRemaining( this::process );
+  }
   /**
    * Process the given field, which is a named node. This is where the
    * application does the up-front work of mapping references to their fully
    * recursively dereferenced values.
+   *
    * @param field The named node.
    */
   private void process( final Entry<String, JsonNode> field ) {
     final JsonNode node = field.getValue();
     if( node.isObject() ) {
       process( node );
     } else {
       final JsonNode fieldValue = field.getValue();
       // Only basic data types can be parsed into variable values. For
       // node structures, YAML has a built-in mechanism.
       if( fieldValue.isValueNode() ) {
         try {
           resolve( fieldValue.asText() );
         } catch( StackOverflowError e ) {
           throw new IllegalArgumentException(
             "Unresolvable: " + node.textValue() + " = " + fieldValue );
+        }
+      }
+    }
+  }
   /**
    * Inserts the delimited references and field values into the cache. This will
    * overwrite existing references.
+   *
    * @param fieldValue YAML field containing zero or more delimited references.
    * If it contains a delimited reference, the parameter is modified with the
    * dereferenced value before it is returned.
+   *
    * @return fieldValue without delimited references.
    */
   private String resolve( String fieldValue ) {
     final Matcher matcher = patternMatch( fieldValue );
     while( matcher.find() ) {
       final String delimited = matcher.group( GROUP_DELIMITED );
       final String reference = matcher.group( GROUP_REFERENCE );
       final String dereference = resolve( lookup( reference ) );
       fieldValue = fieldValue.replace( delimited, dereference );
       // This will perform some superfluous calls by overwriting existing
       // items in the delimited reference map.
       put( delimited, dereference );
+    }
     return fieldValue;
+  }
   /**
    * Inserts a key/value pair into the references map. The map retains
    * references and dereferenced values found in the YAML. If the reference
    * already exists, this will overwrite with a new value.
+   *
    * @param delimited The variable name.
    * @param dereferenced The resolved value.
    */
   private void put( String delimited, String dereferenced ) {
     if( dereferenced.isEmpty() ) {
       missing( delimited );
     } else {
       getReferences().put( delimited, dereferenced );
+    }
+  }
   /**
    * Writes the modified YAML document to standard output.
    */
   private void writeDocument() throws IOException {
     getObjectMapper().writeValue( System.out, getDocumentRoot() );
+  }
   /**
    * Called when a delimited reference is dereferenced to an empty string. This
    * should produce a warning for the user.
+   *
    * @param delimited Delimited reference with no derived value.
    */
   private void missing( final String delimited ) {
     throw new InvalidParameterException(
       MessageFormat.format( "Missing value for '{0}'.", delimited ) );
+  }
   /**
    * Returns a REGEX_PATTERN matcher for the given text.
+   *
    * @param text The text that contains zero or more instances of a
    * REGEX_PATTERN that can be found using the regular expression.
    */
   private Matcher patternMatch( String text ) {
     return getPattern().matcher( text );
+  }
   /**
    * Finds the YAML value for a reference.
+   *
    * @param reference References a value in the YAML document.
+   *
    * @return The dereferenced value.
    */
   private String lookup( final String reference ) {
     return getDocumentRoot().at( asPath( reference ) ).asText();
+  }
   /**
    * Converts a reference (not delimited) to a path that can be used to find a
    * value that should exist inside the YAML document.
+   *
    * @param reference The reference to convert to a YAML document path.
+   *
    * @return The reference with a leading slash and its separator characters
    * converted to slashes.
    */
   private String asPath( final String reference ) {
     return SEPARATOR_YAML + reference.replace( getDelimitedSeparator(), SEPARATOR_YAML );
+  }
   /**
    * Sets the parent node for the entire YAML document tree.
+   *
    * @param documentRoot The parent node.
    */
   private void setDocumentRoot( ObjectNode documentRoot ) {
     this.documentRoot = documentRoot;
+  }
   /**
    * Returns the parent node for the entire YAML document tree.
+   *
    * @return The parent node.
    */
   private ObjectNode getDocumentRoot() {
     return this.documentRoot;
+  }
   /**
    * Returns the compiled regular expression REGEX_PATTERN used to match
    * delimited references.
+   *
    * @return A compiled regex for use with the Matcher.
    */
   private Pattern getPattern() {
     return REGEX_PATTERN;
+  }
   /**
    * Returns the list of references mapped to dereferenced values.
+   *
    * @return
    */
   private Map<String, String> getReferences() {
     if( this.references == null ) {
       this.references = createReferences();
+    }
     return this.references;
+  }
   /**
    * Subclasses can override this method to insert their own map.
+   *
    * @return An empty HashMap, never null.
    */
   protected Map<String, String> createReferences() {
     return new HashMap<>();
+  }
   private class ResolverYAMLFactory extends YAMLFactory {
     @Override
     protected YAMLGenerator _createGenerator(
       final Writer out, final IOContext ctxt ) throws IOException {
       return new ResolverYAMLGenerator(
         ctxt, _generatorFeatures, _yamlGeneratorFeatures, _objectCodec,
         out, _version );
+    }
+  }
   private class ResolverYAMLGenerator extends YAMLGenerator {
     public ResolverYAMLGenerator(
       final IOContext ctxt,
       final int jsonFeatures,
       final int yamlFeatures,
       final ObjectCodec codec,
       final Writer out,
       final DumperOptions.Version version ) throws IOException {
       super( ctxt, jsonFeatures, yamlFeatures, codec, out, version );
+    }
     @Override
     public void writeString( final String text )
       throws IOException, JsonGenerationException {
       super.writeString( substitute( text ) );
+    }
+  }
   private YAMLFactory getYAMLFactory() {
     return new ResolverYAMLFactory();
+  }
   private ObjectMapper getObjectMapper() {
     return new ObjectMapper( getYAMLFactory() );
+  }
   /**
    * Returns the character used to separate YAML paths within delimited
    * references. This will return only the first character of the command line
    * parameter, if the default is overridden.
+   *
    * @return A period by default.
    */
   private char getDelimitedSeparator() {
     return SEPARATOR.charAt( 0 );
+  }
+}

A src/main/java/com/scrivenvar/definition/yaml/YamlTreeAdapter.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.definition.yaml;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.scrivenvar.definition.VariableTreeItem;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map.Entry;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 /**
  * Transforms a JsonNode hierarchy into a tree that can be displayed in a user
  * interface.
+ *
  * @author White Magic Software, Ltd.
  */
 public class YamlTreeAdapter {
   private YamlParser yamlParser;
   public YamlTreeAdapter( final YamlParser parser ) {
     setYamlParser( parser );
+  }
   /**
    * Converts a YAML document to a TreeView based on the document keys. Only the
    * first document in the stream is adapted. This does not close the stream.
+   *
    * @param in Contains a YAML document.
    * @param name Root TreeItem node name.
+   *
    * @return A TreeView populated with all the keys in the YAML document.
+   *
    * @throws IOException Could not read from the stream.
    */
   public TreeView<String> adapt( final InputStream in, final String name )
     throws IOException {
     final JsonNode rootNode = getYamlParser().process( in );
     final TreeItem<String> rootItem = createTreeItem( name );
     rootItem.setExpanded( true );
     adapt( rootNode, rootItem );
     return new TreeView<>( rootItem );
+  }
   /**
    * Iterate over a given root node (at any level of the tree) and adapt each
    * leaf node.
+   *
    * @param rootNode A JSON node (YAML node) to adapt.
    * @param rootItem The tree item to use as the root when processing the node.
    */
   private void adapt(
     final JsonNode rootNode, final TreeItem<String> rootItem ) {
     rootNode.fields().forEachRemaining(
       (Entry<String, JsonNode> leaf) -> adapt( leaf, rootItem )
     );
+  }
   /**
    * Recursively adapt each rootNode to a corresponding rootItem.
+   *
    * @param rootNode The node to adapt.
    * @param rootItem The item to adapt using the node's key.
    */
   private void adapt(
     final Entry<String, JsonNode> rootNode, final TreeItem<String> rootItem ) {
     final JsonNode leafNode = rootNode.getValue();
     final String key = rootNode.getKey();
     final TreeItem<String> leaf = createTreeItem( key );
     if( leafNode.isValueNode() ) {
       leaf.getChildren().add( createTreeItem( rootNode.getValue().asText() ) );
+    }
     rootItem.getChildren().add( leaf );
     if( leafNode.isObject() ) {
       adapt( leafNode, leaf );
+    }
+  }
   /**
    * Creates a new tree item that can be added to the tree view.
+   *
    * @param value The node's value.
+   *
    * @return A new tree item node, never null.
    */
   private TreeItem<String> createTreeItem( final String value ) {
     return new VariableTreeItem<>( value );
+  }
   private YamlParser getYamlParser() {
     return this.yamlParser;
+  }
   private void setYamlParser( final YamlParser yamlParser ) {
     this.yamlParser = yamlParser;
+  }
+}

A src/main/java/com/scrivenvar/dialogs/ImageDialog.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.dialogs;
 import com.scrivenvar.Messages;
 import com.scrivenvar.controls.BrowseFileButton;
 import com.scrivenvar.controls.EscapeTextField;
 import com.scrivenvar.service.events.impl.ButtonOrderPane;
 import java.nio.file.Path;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.Label;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Window;
 import org.tbee.javafx.scene.layout.fxml.MigPane;
 /**
  * Dialog to enter a markdown image.
+ *
  * @author Karl Tauber
  */
 public class ImageDialog extends Dialog<String> {
   private final StringProperty image = new SimpleStringProperty();
   public ImageDialog( Window owner, Path basePath ) {
     setTitle( Messages.get( "ImageDialog.title" ) );
     initOwner( owner );
     setResizable( true );
     initComponents();
     linkBrowseFileButton.setBasePath( basePath );
     linkBrowseFileButton.addExtensionFilter( new ExtensionFilter( Messages.get( "ImageDialog.chooser.imagesFilter" ), "*.png", "*.gif", "*.jpg" ) );
     linkBrowseFileButton.urlProperty().bindBidirectional( urlField.escapedTextProperty() );
     setDialogPane( new ButtonOrderPane() );
     final DialogPane dialogPane = getDialogPane();
     dialogPane.setContent( pane );
     dialogPane.getButtonTypes().addAll( ButtonType.OK, ButtonType.CANCEL );
     dialogPane.lookupButton( ButtonType.OK ).disableProperty().bind(
       urlField.escapedTextProperty().isEmpty()
       .or( textField.escapedTextProperty().isEmpty() ) );
     image.bind( Bindings.when( titleField.escapedTextProperty().isNotEmpty() )
       .then( Bindings.format( "![%s](%s \"%s\")", textField.escapedTextProperty(), urlField.escapedTextProperty(), titleField.escapedTextProperty() ) )
       .otherwise( Bindings.format( "![%s](%s)", textField.escapedTextProperty(), urlField.escapedTextProperty() ) ) );
     previewField.textProperty().bind( image );
     setResultConverter( dialogButton -> {
       ButtonData data = (dialogButton != null) ? dialogButton.getButtonData() : null;
       return (data == ButtonData.OK_DONE) ? image.get() : null;
     } );
     Platform.runLater( () -> {
       urlField.requestFocus();
       if( urlField.getText().startsWith( "http://" ) ) {
         urlField.selectRange( "http://".length(), urlField.getLength() );
+      }
     } );
+  }
   private void initComponents() {
     // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
     pane = new MigPane();
     Label urlLabel = new Label();
     urlField = new EscapeTextField();
     linkBrowseFileButton = new BrowseFileButton();
     Label textLabel = new Label();
     textField = new EscapeTextField();
     Label titleLabel = new Label();
     titleField = new EscapeTextField();
     Label previewLabel = new Label();
     previewField = new Label();
     //======== pane ========
+    {
       pane.setCols( "[shrink 0,fill][300,grow,fill][fill]" );
       pane.setRows( "[][][][]" );
       //---- urlLabel ----
       urlLabel.setText( Messages.get( "ImageDialog.urlLabel.text" ) );
       pane.add( urlLabel, "cell 0 0" );
       //---- urlField ----
       urlField.setEscapeCharacters( "()" );
       urlField.setText( "http://yourlink.com" );
       urlField.setPromptText( "http://yourlink.com" );
       pane.add( urlField, "cell 1 0" );
       pane.add( linkBrowseFileButton, "cell 2 0" );
       //---- textLabel ----
       textLabel.setText( Messages.get( "ImageDialog.textLabel.text" ) );
       pane.add( textLabel, "cell 0 1" );
       //---- textField ----
       textField.setEscapeCharacters( "[]" );
       pane.add( textField, "cell 1 1 2 1" );
       //---- titleLabel ----
       titleLabel.setText( Messages.get( "ImageDialog.titleLabel.text" ) );
       pane.add( titleLabel, "cell 0 2" );
       pane.add( titleField, "cell 1 2 2 1" );
       //---- previewLabel ----
       previewLabel.setText( Messages.get( "ImageDialog.previewLabel.text" ) );
       pane.add( previewLabel, "cell 0 3" );
       pane.add( previewField, "cell 1 3 2 1" );
+    }
     // JFormDesigner - End of component initialization  //GEN-END:initComponents
+  }
   // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
   private MigPane pane;
   private EscapeTextField urlField;
   private BrowseFileButton linkBrowseFileButton;
   private EscapeTextField textField;
   private EscapeTextField titleField;
   private Label previewField;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
+}

A src/main/java/com/scrivenvar/dialogs/ImageDialog.jfd

 JFDML JFormDesigner: "9.9.9.9.9999" Java: "1.8.0_66" encoding: "UTF-8"
 new FormModel {
 	"i18n.bundlePackage": "com.scrivendor"
 	"i18n.bundleName": "messages"
 	"i18n.autoExternalize": true
 	"i18n.keyPrefix": "ImageDialog"
 	contentType: "form/javafx"
 	root: new FormRoot {
 		add( new FormContainer( "org.tbee.javafx.scene.layout.fxml.MigPane", new FormLayoutManager( class org.tbee.javafx.scene.layout.fxml.MigPane ) {
 			"$layoutConstraints": ""
 			"$columnConstraints": "[shrink 0,fill][300,grow,fill][fill]"
 			"$rowConstraints": "[][][][]"
 		} ) {
 			name: "pane"
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "urlLabel"
 				"text": new FormMessage( null, "ImageDialog.urlLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "urlField"
 				"escapeCharacters": "()"
 				"text": "http://yourlink.com"
 				"promptText": "http://yourlink.com"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.BrowseFileButton" ) {
 				name: "linkBrowseFileButton"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 0"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "textLabel"
 				"text": new FormMessage( null, "ImageDialog.textLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 1"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "textField"
 				"escapeCharacters": "[]"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 1 2 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "titleLabel"
 				"text": new FormMessage( null, "ImageDialog.titleLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 2"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "titleField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 2 2 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewLabel"
 				"text": new FormMessage( null, "ImageDialog.previewLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 3"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 3 2 1"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new javafx.geometry.Point2D( 0.0, 0.0 )
 			"size": new javafx.geometry.Dimension2D( 500.0, 300.0 )
 		} )
+	}
+}

A src/main/java/com/scrivenvar/dialogs/LinkDialog.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.dialogs;
 import com.scrivenvar.Messages;
 import com.scrivenvar.controls.EscapeTextField;
 import com.scrivenvar.editors.markdown.HyperlinkModel;
 import com.scrivenvar.service.events.impl.ButtonOrderPane;
 import java.nio.file.Path;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.Label;
 import javafx.stage.Window;
 import org.tbee.javafx.scene.layout.fxml.MigPane;
 /**
  * Dialog to enter a markdown link.
+ *
  * @author Karl Tauber
  */
 public class LinkDialog extends Dialog<String> {
   private final StringProperty link = new SimpleStringProperty();
   public LinkDialog( final Window owner, final HyperlinkModel hyperlink, final Path basePath ) {
     setTitle( Messages.get( "LinkDialog.title" ) );
     initOwner( owner );
     setResizable( true );
     initComponents();
     setDialogPane( new ButtonOrderPane() );
     final DialogPane dialog = getDialogPane();
     dialog.setContent( pane );
     dialog.getButtonTypes().addAll( ButtonType.OK, ButtonType.CANCEL );
     dialog.lookupButton( ButtonType.OK ).disableProperty().bind(
       urlField.escapedTextProperty().isEmpty() );
     textField.setText( hyperlink.getText() );
     urlField.setText( hyperlink.getUrl() );
     titleField.setText( hyperlink.getTitle() );
     link.bind( Bindings.when( titleField.escapedTextProperty().isNotEmpty() )
       .then( Bindings.format( "[%s](%s \"%s\")", textField.escapedTextProperty(), urlField.escapedTextProperty(), titleField.escapedTextProperty() ) )
       .otherwise( Bindings.when( textField.escapedTextProperty().isNotEmpty() )
         .then( Bindings.format( "[%s](%s)", textField.escapedTextProperty(), urlField.escapedTextProperty() ) )
         .otherwise( urlField.escapedTextProperty() ) ) );
     setResultConverter( dialogButton -> {
       ButtonData data = (dialogButton != null) ? dialogButton.getButtonData() : null;
       return (data == ButtonData.OK_DONE) ? link.get() : null;
     } );
     Platform.runLater( () -> {
       urlField.requestFocus();
       urlField.selectRange( 0, urlField.getLength() );
     } );
+  }
   private void initComponents() {
     // JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
     pane = new MigPane();
     Label urlLabel = new Label();
     urlField = new EscapeTextField();
     Label textLabel = new Label();
     textField = new EscapeTextField();
     Label titleLabel = new Label();
     titleField = new EscapeTextField();
     //======== pane ========
+    {
       pane.setCols( "[shrink 0,fill][300,grow,fill][fill][fill]" );
       pane.setRows( "[][][][]" );
       //---- urlLabel ----
       urlLabel.setText( Messages.get( "LinkDialog.urlLabel.text" ) );
       pane.add( urlLabel, "cell 0 0" );
       //---- urlField ----
       urlField.setEscapeCharacters( "()" );
       pane.add( urlField, "cell 1 0" );
       //---- textLabel ----
       textLabel.setText( Messages.get( "LinkDialog.textLabel.text" ) );
       pane.add( textLabel, "cell 0 1" );
       //---- textField ----
       textField.setEscapeCharacters( "[]" );
       pane.add( textField, "cell 1 1 3 1" );
       //---- titleLabel ----
       titleLabel.setText( Messages.get( "LinkDialog.titleLabel.text" ) );
       pane.add( titleLabel, "cell 0 2" );
       pane.add( titleField, "cell 1 2 3 1" );
+    }
     // JFormDesigner - End of component initialization  //GEN-END:initComponents
+  }
   // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
   private MigPane pane;
   private EscapeTextField urlField;
   private EscapeTextField textField;
   private EscapeTextField titleField;
   // JFormDesigner - End of variables declaration  //GEN-END:variables
+}

A src/main/java/com/scrivenvar/dialogs/LinkDialog.jfd

 JFDML JFormDesigner: "9.9.9.9.9999" Java: "1.8.0_66" encoding: "UTF-8"
 new FormModel {
 	"i18n.bundlePackage": "com.scrivendor"
 	"i18n.bundleName": "messages"
 	"i18n.autoExternalize": true
 	"i18n.keyPrefix": "LinkDialog"
 	contentType: "form/javafx"
 	root: new FormRoot {
 		add( new FormContainer( "org.tbee.javafx.scene.layout.fxml.MigPane", new FormLayoutManager( class org.tbee.javafx.scene.layout.fxml.MigPane ) {
 			"$layoutConstraints": ""
 			"$columnConstraints": "[shrink 0,fill][300,grow,fill][fill][fill]"
 			"$rowConstraints": "[][][][]"
 		} ) {
 			name: "pane"
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "urlLabel"
 				"text": new FormMessage( null, "LinkDialog.urlLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "urlField"
 				"escapeCharacters": "()"
 				"text": "http://yourlink.com"
 				"promptText": "http://yourlink.com"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.BrowseDirectoryButton" ) {
 				name: "linkBrowseDirectoyButton"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 0"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.BrowseFileButton" ) {
 				name: "linkBrowseFileButton"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 3 0"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "textLabel"
 				"text": new FormMessage( null, "LinkDialog.textLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 1"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "textField"
 				"escapeCharacters": "[]"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 1 3 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "titleLabel"
 				"text": new FormMessage( null, "LinkDialog.titleLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 2"
 			} )
 			add( new FormComponent( "com.scrivendor.controls.EscapeTextField" ) {
 				name: "titleField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 2 3 1"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewLabel"
 				"text": new FormMessage( null, "LinkDialog.previewLabel.text" )
 				auxiliary() {
 					"JavaCodeGenerator.variableLocal": true
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 3"
 			} )
 			add( new FormComponent( "javafx.scene.control.Label" ) {
 				name: "previewField"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 3 3 1"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new javafx.geometry.Point2D( 0.0, 0.0 )
 			"size": new javafx.geometry.Dimension2D( 500.0, 300.0 )
 		} )
+	}
+}

A src/main/java/com/scrivenvar/editors/EditorPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors;
 import com.scrivenvar.AbstractPane;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.event.Event;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.InputEvent;
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.StyleClassedTextArea;
 import org.fxmisc.undo.UndoManager;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import org.fxmisc.wellbehaved.event.InputMap;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 import org.fxmisc.wellbehaved.event.Nodes;
 /**
  * Represents common editing features for various types of text editors.
+ *
  * @author White Magic Software, Ltd.
  */
 public class EditorPane extends AbstractPane {
   private StyleClassedTextArea editor;
   private VirtualizedScrollPane<StyleClassedTextArea> scrollPane;
   private final ObjectProperty<Path> path = new SimpleObjectProperty<>();
   /**
    * Set when entering variable edit mode; retrieved upon exiting.
    */
   private InputMap<InputEvent> nodeMap;
   @Override
   public void requestFocus() {
     Platform.runLater( () -> getEditor().requestFocus() );
+  }
   public void undo() {
     getUndoManager().undo();
+  }
   public void redo() {
     getUndoManager().redo();
+  }
   public UndoManager getUndoManager() {
     return getEditor().getUndoManager();
+  }
   public String getText() {
     return getEditor().getText();
+  }
   public void setText( final String text ) {
     getEditor().deselect();
     getEditor().replaceText( text );
     getUndoManager().mark();
+  }
   /**
    * Call to hook into changes to the text area.
+   *
    * @param listener Receives editor text change events.
    */
   public void addTextChangeListener( final ChangeListener<? super String> listener ) {
     getEditor().textProperty().addListener( listener );
+  }
   /**
    * Call to listen for when the caret moves to another paragraph.
+   *
    * @param listener Receives paragraph change events.
    */
   public void addCaretParagraphListener(
     final ChangeListener<? super Integer> listener ) {
     getEditor().currentParagraphProperty().addListener( listener );
+  }
   /**
    * This method adds listeners to editor events.
+   *
    * @param <T> The event type.
    * @param <U> The consumer type for the given event type.
    * @param event The event of interest.
    * @param consumer The method to call when the event happens.
    */
   public <T extends Event, U extends T> void addEventListener(
     final EventPattern<? super T, ? extends U> event,
     final Consumer<? super U> consumer ) {
     Nodes.addInputMap( getEditor(), consume( event, consumer ) );
+  }
   /**
    * This method adds listeners to editor events that can be removed without
    * affecting the original listeners (i.e., the original lister is restored on
    * a call to removeEventListener).
+   *
    * @param map The map of methods to events.
    */
   @SuppressWarnings( "unchecked" )
   public void addEventListener( final InputMap<InputEvent> map ) {
     this.nodeMap = (InputMap<InputEvent>)getInputMap();
     Nodes.addInputMap( getEditor(), map );
+  }
   /**
    * This method removes listeners to editor events and restores the default
    * handler.
+   *
    * @param map The map of methods to events.
    */
   public void removeEventListener( final InputMap<InputEvent> map ) {
     Nodes.removeInputMap( getEditor(), map );
     Nodes.addInputMap( getEditor(), this.nodeMap );
+  }
   /**
    * Returns the value for "org.fxmisc.wellbehaved.event.inputmap".
+   *
    * @return An input map of input events.
    */
   private Object getInputMap() {
     return getEditor().getProperties().get( getInputMapKey() );
+  }
   /**
    * Returns the hashmap key entry for the input map.
+   *
    * @return "org.fxmisc.wellbehaved.event.inputmap"
    */
   private String getInputMapKey() {
     return "org.fxmisc.wellbehaved.event.inputmap";
+  }
   public void scrollToTop() {
     getEditor().moveTo( 0 );
+  }
   private void setEditor( StyleClassedTextArea textArea ) {
     this.editor = textArea;
+  }
   public synchronized StyleClassedTextArea getEditor() {
     if( this.editor == null ) {
       setEditor( createTextArea() );
+    }
     return this.editor;
+  }
   /**
    * Returns the scroll pane that contains the text area.
+   *
    * @return The scroll pane that contains the content to edit.
    */
   public synchronized VirtualizedScrollPane<StyleClassedTextArea> getScrollPane() {
     if( this.scrollPane == null ) {
       this.scrollPane = createScrollPane();
+    }
     return this.scrollPane;
+  }
   protected VirtualizedScrollPane<StyleClassedTextArea> createScrollPane() {
     final VirtualizedScrollPane<StyleClassedTextArea> pane
       = new VirtualizedScrollPane<>( getEditor() );
     pane.setVbarPolicy( ScrollPane.ScrollBarPolicy.ALWAYS );
     return pane;
+  }
   protected StyleClassedTextArea createTextArea() {
     return new StyleClassedTextArea( false );
+  }
   public Path getPath() {
     return this.path.get();
+  }
   public void setPath( final Path path ) {
     this.path.set( path );
+  }
   public ObjectProperty<Path> pathProperty() {
     return this.path;
+  }
+}

A src/main/java/com/scrivenvar/editors/VariableNameInjector.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors;
 import com.scrivenvar.FileEditorTabPane;
 import com.scrivenvar.Services;
 import com.scrivenvar.decorators.VariableDecorator;
 import com.scrivenvar.decorators.YamlVariableDecorator;
 import com.scrivenvar.definition.DefinitionPane;
 import com.scrivenvar.definition.VariableTreeItem;
 import static com.scrivenvar.definition.yaml.YamlParser.SEPARATOR;
 import com.scrivenvar.service.Settings;
 import static com.scrivenvar.util.Lists.getFirst;
 import static com.scrivenvar.util.Lists.getLast;
 import static java.lang.Character.isSpaceChar;
 import static java.lang.Character.isWhitespace;
 import static java.lang.Math.min;
 import java.util.function.Consumer;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.scene.control.IndexRange;
 import javafx.scene.control.TreeItem;
 import javafx.scene.input.InputEvent;
 import javafx.scene.input.KeyCode;
 import static javafx.scene.input.KeyCode.AT;
 import static javafx.scene.input.KeyCode.DIGIT2;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.MINUS;
 import static javafx.scene.input.KeyCode.SPACE;
 import static javafx.scene.input.KeyCombination.CONTROL_DOWN;
 import static javafx.scene.input.KeyCombination.SHIFT_DOWN;
 import javafx.scene.input.KeyEvent;
 import org.fxmisc.richtext.StyledTextArea;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyTyped;
 import org.fxmisc.wellbehaved.event.InputMap;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 import static org.fxmisc.wellbehaved.event.InputMap.sequence;
 import static com.scrivenvar.util.Lists.getFirst;
 import static com.scrivenvar.util.Lists.getLast;
 import static java.lang.Character.isSpaceChar;
 import static java.lang.Character.isWhitespace;
 import static java.lang.Math.min;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyTyped;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 /**
  * Provides the logic for injecting variable names within the editor.
+ *
  * @author White Magic Software, Ltd.
  */
 public class VariableNameInjector {
   public static final int DEFAULT_MAX_VAR_LENGTH = 64;
   private static final int NO_DIFFERENCE = -1;
   private final Settings settings = Services.load( Settings.class );
   /**
    * Used to capture keyboard events once the user presses @.
    */
   private InputMap<InputEvent> keyboardMap;
   private FileEditorTabPane fileEditorPane;
   private DefinitionPane definitionPane;
   /**
    * Position of the variable in the text when in variable mode (0 by default).
    */
   private int initialCaretPosition;
   public VariableNameInjector(
     final FileEditorTabPane editorPane,
     final DefinitionPane definitionPane ) {
     setFileEditorPane( editorPane );
     setDefinitionPane( definitionPane );
     initKeyboardEventListeners();
+  }
   /**
    * Traps keys for performing various short-cut tasks, such as @-mode variable
    * insertion and control+space for variable autocomplete.
+   *
    * @ key is pressed, a new keyboard map is inserted in place of the current
    * map -- this class goes into "variable edit mode" (a.k.a. vMode).
+   *
    * @see createKeyboardMap()
    */
   private void initKeyboardEventListeners() {
     addEventListener( keyPressed( SPACE, CONTROL_DOWN ), this::autocomplete );
     // @ key in Linux?
     addEventListener( keyPressed( DIGIT2, SHIFT_DOWN ), this::vMode );
     // @ key in Windows.
     addEventListener( keyPressed( AT ), this::vMode );
+  }
   /**
    * The @ symbol is a short-cut to inserting a YAML variable reference.
+   *
    * @param e Superfluous information about the key that was pressed.
    */
   private void vMode( KeyEvent e ) {
     setInitialCaretPosition();
     vModeStart();
     vModeAutocomplete();
+  }
   /**
    * Receives key presses until the user completes the variable selection. This
    * allows the arrow keys to be used for selecting variables.
+   *
    * @param e The key that was pressed.
    */
   private void vModeKeyPressed( KeyEvent e ) {
     final KeyCode keyCode = e.getCode();
     switch( keyCode ) {
       case BACK_SPACE:
         // Don't decorate the variable upon exiting vMode.
         vModeBackspace();
         break;
       case ESCAPE:
         // Don't decorate the variable upon exiting vMode.
         vModeStop();
         break;
       case ENTER:
       case PERIOD:
       case RIGHT:
       case END:
         // Stop at a leaf node, ENTER means accept.
         if( vModeConditionalComplete() && keyCode == ENTER ) {
           vModeStop();
           // Decorate the variable upon exiting vMode.
           decorateVariable();
+        }
         break;
       case UP:
         cyclePathPrev();
         break;
       case DOWN:
         cyclePathNext();
         break;
       default:
         vModeFilterKeyPressed( e );
         break;
+    }
     e.consume();
+  }
   private void vModeBackspace() {
     deleteSelection();
     // Break out of variable mode by back spacing to the original position.
     if( getCurrentCaretPosition() > getInitialCaretPosition() ) {
       vModeAutocomplete();
     } else {
       vModeStop();
+    }
+  }
   /**
    * Updates the text with the path selected (or typed) by the user.
    */
   private void vModeAutocomplete() {
     final TreeItem<String> node = getCurrentNode();
     if( !node.isLeaf() ) {
       final String word = getLastPathWord();
       final String label = node.getValue();
       final int delta = difference( label, word );
       final String remainder = delta == NO_DIFFERENCE
         ? label
         : label.substring( delta );
       final StyledTextArea textArea = getEditor();
       final int posBegan = getCurrentCaretPosition();
       final int posEnded = posBegan + remainder.length();
       textArea.replaceSelection( remainder );
       if( posEnded - posBegan > 0 ) {
         textArea.selectRange( posEnded, posBegan );
+      }
       expand( node );
+    }
+  }
   /**
    * Only variable name keys can pass through the filter. This is called when
    * the user presses a key.
+   *
    * @param e The key that was pressed.
    */
   private void vModeFilterKeyPressed( final KeyEvent e ) {
     if( isVariableNameKey( e ) ) {
       typed( e.getText() );
+    }
+  }
   /**
    * Performs an autocomplete depending on whether the user has finished typing
    * in a word. If there is a selected range, then this will complete the most
    * recent word and jump to the next child.
+   *
    * @return true The auto-completed node was a terminal node.
    */
   private boolean vModeConditionalComplete() {
     acceptPath();
     final TreeItem<String> node = getCurrentNode();
     final boolean terminal = isTerminal( node );
     if( !terminal ) {
       typed( SEPARATOR );
+    }
     return terminal;
+  }
   /**
    * Pressing control+space will find a node that matches the current word and
    * substitute the YAML variable reference. This is called when the user is not
    * editing in vMode.
+   *
    * @param e Ignored -- it can only be Ctrl+Space.
    */
   private void autocomplete( KeyEvent e ) {
     final String paragraph = getCaretParagraph();
     final int[] boundaries = getWordBoundaries( paragraph );
     final String word = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );
     final VariableTreeItem<String> leaf = findLeaf( word );
     if( leaf != null ) {
       replaceText( boundaries[ 0 ], boundaries[ 1 ], leaf.toPath() );
       decorateVariable();
       expand( leaf );
+    }
+  }
   /**
    * Called when autocomplete finishes on a valid leaf or when the user presses
    * Enter to finish manual autocomplete.
    */
   private void decorateVariable() {
     // A little bit of duplication...
     final String paragraph = getCaretParagraph();
     final int[] boundaries = getWordBoundaries( paragraph );
     final String old = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );
     final String newVariable = getVariableDecorator().decorate( old );
     final int posEnded = getCurrentCaretPosition();
     final int posBegan = posEnded - old.length();
     getEditor().replaceText( posBegan, posEnded, newVariable );
+  }
   /**
    * Updates the text at the given position within the current paragraph.
+   *
    * @param posBegan The starting index in the paragraph text to replace.
    * @param posEnded The ending index in the paragraph text to replace.
    * @param text Overwrite the paragraph substring with this text.
    */
   private void replaceText(
     final int posBegan, final int posEnded, final String text ) {
     final int p = getCurrentParagraph();
     getEditor().replaceText( p, posBegan, p, posEnded, text );
+  }
   /**
    * Returns the caret's current paragraph position.
+   *
    * @return A number greater than or equal to 0.
    */
   private int getCurrentParagraph() {
     return getEditor().getCurrentParagraph();
+  }
   /**
    * Returns current word boundary indexes into the current paragraph, including
    * punctuation.
+   *
    * @param p The paragraph wherein to hunt word boundaries.
    * @param offset The offset into the paragraph to begin scanning left and
    * right.
+   *
    * @return The starting and ending index of the word closest to the caret.
    */
   private int[] getWordBoundaries( final String p, final int offset ) {
     // Remove dashes, but retain hyphens. Retain same number of characters
     // to preserve relative indexes.
     final String paragraph = p.replace( "---", "   " ).replace( "--", "  " );
     return getWordAt( paragraph, offset );
+  }
   /**
    * Helper method to get the word boundaries for the current paragraph.
+   *
    * @param paragraph
+   *
    * @return
    */
   private int[] getWordBoundaries( final String paragraph ) {
     return getWordBoundaries( paragraph, getCurrentCaretColumn() );
+  }
   /**
    * Given an arbitrary offset into a string, this returns the word at that
    * index. The inputs and outputs include:
+   *
    * <ul>
    * <li>surrounded by space: <code>hello | world!</code> ("");</li>
    * <li>end of word: <code>hello| world!</code> ("hello");</li>
    * <li>start of a word: <code>hello |world!</code> ("world!");</li>
    * <li>within a word: <code>hello wo|rld!</code> ("world!");</li>
    * <li>end of a paragraph: <code>hello world!|</code> ("world!");</li>
    * <li>start of a paragraph: <code>|hello world!</code> ("hello!"); or</li>
    * <li>after punctuation: <code>hello world!|</code> ("world!").</li>
    * </ul>
+   *
    * @param p The string to scan for a word.
    * @param offset The offset within s to begin searching for the nearest word
    * boundary, must not be out of bounds of s.
+   *
    * @return The word in s at the offset.
+   *
    * @see getWordBegan( String, int )
    * @see getWordEnded( String, int )
    */
   private int[] getWordAt( final String p, final int offset ) {
     return new int[]{ getWordBegan( p, offset ), getWordEnded( p, offset ) };
+  }
   /**
    * Returns the index into s where a word begins.
+   *
    * @param s Never null.
    * @param offset Index into s to begin searching backwards for a word
    * boundary.
+   *
    * @return The index where a word begins.
    */
   private int getWordBegan( final String s, int offset ) {
     while( offset > 0 && isBoundary( s.charAt( offset - 1 ) ) ) {
       offset--;
+    }
     return offset;
+  }
   /**
    * Returns the index into s where a word ends.
+   *
    * @param s Never null.
    * @param offset Index into s to begin searching forwards for a word boundary.
+   *
    * @return The index where a word ends.
    */
   private int getWordEnded( final String s, int offset ) {
     final int length = s.length();
     while( offset < length && isBoundary( s.charAt( offset ) ) ) {
       offset++;
+    }
     return offset;
+  }
   /**
    * Returns true if the given character can be reasonably expected to be part
    * of a word, including punctuation marks.
+   *
    * @param c The character to compare.
+   *
    * @return false The character is a space character.
    */
   private boolean isBoundary( final char c ) {
     return !isSpaceChar( c );
+  }
   /**
    * Returns the text for the paragraph that contains the caret.
+   *
    * @return A non-null string, possibly empty.
    */
   private String getCaretParagraph() {
     return getEditor().getText( getCurrentParagraph() );
+  }
   /**
    * Returns true if the node has children that can be selected (i.e., any
    * non-leaves).
+   *
    * @param <T> The type that the TreeItem contains.
    * @param node The node to test for terminality.
+   *
    * @return true The node has one branch and its a leaf.
    */
   private <T> boolean isTerminal( final TreeItem<T> node ) {
     final ObservableList<TreeItem<T>> branches = node.getChildren();
     return branches.size() == 1 && branches.get( 0 ).isLeaf();
+  }
   /**
    * Inserts text that the user typed at the current caret position, then
    * performs an autocomplete for the variable name.
+   *
    * @param text The text to insert, never null.
    */
   private void typed( final String text ) {
     getEditor().replaceSelection( text );
     vModeAutocomplete();
+  }
   /**
    * Called when the user presses either End or Enter key.
    */
   private void acceptPath() {
     final IndexRange range = getSelectionRange();
     if( range != null ) {
       final int rangeEnd = range.getEnd();
       final StyledTextArea textArea = getEditor();
       textArea.deselect();
       textArea.moveTo( rangeEnd );
+    }
+  }
   /**
    * Replaces the entirety of the existing path (from the initial caret
    * position) with the given path.
+   *
    * @param oldPath The path to replace.
    * @param newPath The replacement path.
    */
   private void replacePath( final String oldPath, final String newPath ) {
     final StyledTextArea textArea = getEditor();
     final int posBegan = getInitialCaretPosition();
     final int posEnded = posBegan + oldPath.length();
     textArea.deselect();
     textArea.replaceText( posBegan, posEnded, newPath );
+  }
   /**
    * Called when the user presses the Backspace key.
    */
   private void deleteSelection() {
     final StyledTextArea textArea = getEditor();
     textArea.replaceSelection( "" );
     textArea.deletePreviousChar();
+  }
   /**
    * Cycles the selected text through the nodes.
+   *
    * @param direction true - next; false - previous
    */
   private void cycleSelection( final boolean direction ) {
     final TreeItem<String> node = getCurrentNode();
     // Find the sibling for the current selection and replace the current
     // selection with the sibling's value
     TreeItem< String> cycled = direction
       ? node.nextSibling()
       : node.previousSibling();
     // When cycling at the end (or beginning) of the list, jump to the first
     // (or last) sibling depending on the cycle direction.
     if( cycled == null ) {
       cycled = direction ? getFirstSibling( node ) : getLastSibling( node );
+    }
     final String path = getCurrentPath();
     final String cycledWord = cycled.getValue();
     final String word = getLastPathWord();
     final int index = path.indexOf( word );
     final String cycledPath = path.substring( 0, index ) + cycledWord;
     expand( cycled );
     replacePath( path, cycledPath );
+  }
   /**
    * Cycles to the next sibling of the currently selected tree node.
    */
   private void cyclePathNext() {
     cycleSelection( true );
+  }
   /**
    * Cycles to the previous sibling of the currently selected tree node.
    */
   private void cyclePathPrev() {
     cycleSelection( false );
+  }
   /**
    * Returns the variable name (or as much as has been typed so far). Returns
    * all the characters from the initial caret column to the the first
    * whitespace character. This will return a path that contains zero or more
    * separators.
+   *
    * @return A non-null string, possibly empty.
    */
   private String getCurrentPath() {
     final String s = extractTextChunk();
     final int length = s.length();
     int i = 0;
     while( i < length && !isWhitespace( s.charAt( i ) ) ) {
       i++;
+    }
     return s.substring( 0, i );
+  }
   private <T> ObservableList<TreeItem<T>> getSiblings(
     final TreeItem<T> item ) {
     final TreeItem<T> parent = item.getParent();
     return parent == null ? item.getChildren() : parent.getChildren();
+  }
   private <T> TreeItem<T> getFirstSibling( final TreeItem<T> item ) {
     return getFirst( getSiblings( item ), item );
+  }
   private <T> TreeItem<T> getLastSibling( final TreeItem<T> item ) {
     return getLast( getSiblings( item ), item );
+  }
   /**
    * Returns the caret position as an offset into the text.
+   *
    * @return A value from 0 to the length of the text (minus one).
    */
   private int getCurrentCaretPosition() {
     return getEditor().getCaretPosition();
+  }
   /**
    * Returns the caret position within the current paragraph.
+   *
    * @return A value from 0 to the length of the current paragraph.
    */
   private int getCurrentCaretColumn() {
     return getEditor().getCaretColumn();
+  }
   /**
    * Returns the last word from the path.
+   *
    * @return The last token.
    */
   private String getLastPathWord() {
     String path = getCurrentPath();
     int i = path.indexOf( SEPARATOR );
     while( i > 0 ) {
       path = path.substring( i + 1 );
       i = path.indexOf( SEPARATOR );
+    }
     return path;
+  }
   /**
    * Returns text from the initial caret position until some arbitrarily long
    * number of characters. The number of characters extracted will be
    * getMaxVarLength, or fewer, depending on how many characters remain to be
    * extracted. The result from this method is trimmed to the first whitespace
    * character.
+   *
    * @return A chunk of text that includes all the words representing a path,
    * and then some.
    */
   private String extractTextChunk() {
     final StyledTextArea textArea = getEditor();
     final int textBegan = getInitialCaretPosition();
     final int remaining = textArea.getLength() - textBegan;
     final int textEnded = min( remaining, getMaxVarLength() );
     return textArea.getText( textBegan, textEnded );
+  }
   /**
    * Returns the node for the current path.
    */
   private TreeItem<String> getCurrentNode() {
     return findNode( getCurrentPath() );
+  }
   /**
    * Finds the node that most closely matches the given path.
+   *
    * @param path The path that represents a node.
+   *
    * @return The node for the path, or the root node if the path could not be
    * found, but never null.
    */
   private TreeItem<String> findNode( final String path ) {
     return getDefinitionPane().findNode( path );
+  }
   /**
    * Finds the first leaf having a value that starts with the given text.
+   *
    * @param text The text to find in the definition tree.
+   *
    * @return The leaf that starts with the given text, or null if not found.
    */
   private VariableTreeItem<String> findLeaf( final String text ) {
     return getDefinitionPane().findLeaf( text );
+  }
   /**
    * Used to ignore typed keys in favour of trapping pressed keys.
+   *
    * @param e The key that was typed.
    */
   private void vModeKeyTyped( KeyEvent e ) {
     e.consume();
+  }
   /**
    * Used to lazily initialize the keyboard map.
+   *
    * @return Mappings for keyTyped and keyPressed.
    */
   protected InputMap<InputEvent> createKeyboardMap() {
     return sequence(
       consume( keyTyped(), this::vModeKeyTyped ),
       consume( keyPressed(), this::vModeKeyPressed )
     );
+  }
   private InputMap<InputEvent> getKeyboardMap() {
     if( this.keyboardMap == null ) {
       this.keyboardMap = createKeyboardMap();
+    }
     return this.keyboardMap;
+  }
   /**
    * Collapses the tree then expands and selects the given node.
+   *
    * @param node The node to expand.
    */
   private void expand( final TreeItem<String> node ) {
     final DefinitionPane pane = getDefinitionPane();
     pane.collapse();
     pane.expand( node );
     pane.select( node );
+  }
   /**
    * Returns true iff the key code the user typed can be used as part of a YAML
    * variable name.
+   *
    * @param keyEvent Keyboard key press event information.
+   *
    * @return true The key is a value that can be inserted into the text.
    */
   private boolean isVariableNameKey( final KeyEvent keyEvent ) {
     final KeyCode kc = keyEvent.getCode();
     return (kc.isLetterKey()
       || kc.isDigitKey()
       || (keyEvent.isShiftDown() && kc == MINUS))
       && !keyEvent.isControlDown();
+  }
   /**
    * Starts to capture user input events.
    */
   private void vModeStart() {
     addEventListener( getKeyboardMap() );
+  }
   /**
    * Restores capturing of user input events to the previous event listener.
    * Also asks the processing chain to modify the variable text into a
    * machine-readable variable based on the format required by the file type.
    * For example, a Markdown file (.md) will substitute a $VAR$ name while an R
    * file (.Rmd, .Rxml) will use `r#xVAR`.
    */
   private void vModeStop() {
     removeEventListener( getKeyboardMap() );
+  }
   private VariableDecorator getVariableDecorator() {
     return new YamlVariableDecorator();
+  }
   /**
    * Returns the index where the two strings diverge.
+   *
    * @param s1 The string that could be a substring of s2, null allowed.
    * @param s2 The string that could be a substring of s1, null allowed.
+   *
    * @return NO_DIFFERENCE if the strings are the same, otherwise the index
    * where they differ.
    */
   @SuppressWarnings( "StringEquality" )
   private int difference( final CharSequence s1, final CharSequence s2 ) {
     if( s1 == s2 ) {
       return NO_DIFFERENCE;
+    }
     if( s1 == null || s2 == null ) {
       return 0;
+    }
     int i = 0;
     final int limit = min( s1.length(), s2.length() );
     while( i < limit && s1.charAt( i ) == s2.charAt( i ) ) {
       i++;
+    }
     // If one string was shorter than the other, that's where they differ.
     return i;
+  }
   /**
    * Delegates to the file editor pane, and, ultimately, to its text area.
    */
   private <T extends Event, U extends T> void addEventListener(
     final EventPattern<? super T, ? extends U> event,
     final Consumer<? super U> consumer ) {
     getFileEditorPane().addEventListener( event, consumer );
+  }
   /**
    * Delegates to the file editor pane, and, ultimately, to its text area.
+   *
    * @param map The map of methods to events.
    */
   private void addEventListener( final InputMap<InputEvent> map ) {
     getFileEditorPane().addEventListener( map );
+  }
   private void removeEventListener( final InputMap<InputEvent> map ) {
     getFileEditorPane().removeEventListener( map );
+  }
   /**
    * Returns the position of the caret when variable mode editing was requested.
+   *
    * @return The variable mode caret position.
    */
   private int getInitialCaretPosition() {
     return this.initialCaretPosition;
+  }
   /**
    * Sets the position of the caret when variable mode editing was requested.
    * Stores the current position because only the text that comes afterwards is
    * a suitable variable reference.
+   *
    * @return The variable mode caret position.
    */
   private void setInitialCaretPosition() {
     this.initialCaretPosition = getEditor().getCaretPosition();
+  }
   private StyledTextArea getEditor() {
     return getFileEditorPane().getEditor();
+  }
   public FileEditorTabPane getFileEditorPane() {
     return this.fileEditorPane;
+  }
   private void setFileEditorPane( final FileEditorTabPane fileEditorPane ) {
     this.fileEditorPane = fileEditorPane;
+  }
   private DefinitionPane getDefinitionPane() {
     return this.definitionPane;
+  }
   private void setDefinitionPane( final DefinitionPane definitionPane ) {
     this.definitionPane = definitionPane;
+  }
   private IndexRange getSelectionRange() {
     return getEditor().getSelection();
+  }
   /**
    * Don't look ahead too far when trying to find the end of a node.
+   *
    * @return 512 by default.
    */
   private int getMaxVarLength() {
     return getSettings().getSetting(
       "editor.variable.maxLength", DEFAULT_MAX_VAR_LENGTH );
+  }
   private Settings getSettings() {
     return this.settings;
+  }
+}

A src/main/java/com/scrivenvar/editors/markdown/HyperlinkModel.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors.markdown;
 import com.vladsch.flexmark.ast.Link;
 /**
  * Represents the model for a hyperlink: text and url text.
+ *
  * @author White Magic Software, Ltd.
  */
 public class HyperlinkModel {
   private String text;
   private String url;
   private String title;
   /**
    * Constructs a new hyperlink model in Markdown format by default with no
    * title (i.e., tooltip).
+   *
    * @param text The hyperlink text displayed (e.g., displayed to the user).
    * @param url The destination URL (e.g., when clicked).
    */
   public HyperlinkModel( final String text, final String url ) {
     this( text, url, null );
+  }
   /**
    * Constructs a new hyperlink model for the given AST link.
+   *
    * @param link A markdown link.
    */
   public HyperlinkModel( final Link link ) {
     this(
       link.getText().toString(),
       link.getUrl().toString(),
       link.getTitle().toString()
     );
+  }
   /**
    * Constructs a new hyperlink model in Markdown format by default.
+   *
    * @param text The hyperlink text displayed (e.g., displayed to the user).
    * @param url The destination URL (e.g., when clicked).
    * @param title The hyperlink title (e.g., shown as a tooltip).
    */
   public HyperlinkModel( final String text, final String url, final String title ) {
     setText( text );
     setUrl( url );
     setTitle( title );
+  }
   /**
    * Returns the string in Markdown format by default.
+   *
    * @return A markdown version of the hyperlink.
    */
   @Override
   public String toString() {
     String format = "%s%s%s";
     if( hasText() ) {
       format = "[%s]" + (hasTitle() ? "(%s \"%s\")" : "(%s%s)");
+    }
     // Becomes ""+URL+"" if no text is set.
     // Becomes [TITLE]+(URL)+"" if no title is set.
     // Becomes [TITLE]+(URL+ \"TITLE\") if title is set.
     return String.format( format, getText(), getUrl(), getTitle() );
+  }
   public final void setText( final String text ) {
     this.text = nullSafe( text );
+  }
   public final void setUrl( final String url ) {
     this.url = nullSafe( url );
+  }
   public final void setTitle( final String title ) {
     this.title = nullSafe( title );
+  }
   /**
    * Answers whether text has been set for the hyperlink.
+   *
    * @return true This is a text link.
    */
   public boolean hasText() {
     return !getText().isEmpty();
+  }
   /**
    * Answers whether a title (tooltip) has been set for the hyperlink.
+   *
    * @return true There is a title.
    */
   public boolean hasTitle() {
     return !getTitle().isEmpty();
+  }
   public String getText() {
     return this.text;
+  }
   public String getUrl() {
     return this.url;
+  }
   public String getTitle() {
     return this.title;
+  }
   private String nullSafe( final String s ) {
     return s == null ? "" : s;
+  }
+}

A src/main/java/com/scrivenvar/editors/markdown/LinkVisitor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors.markdown;
 import com.vladsch.flexmark.ast.Link;
 import com.vladsch.flexmark.ast.Node;
 import com.vladsch.flexmark.ast.NodeVisitor;
 import com.vladsch.flexmark.ast.VisitHandler;
 /**
  * @author White Magic Software, Ltd.
  */
 public class LinkVisitor {
   private NodeVisitor visitor;
   private Link link;
   private final int offset;
   /**
    * Creates a hyperlink given an offset into a paragraph and the markdown AST
    * link node.
+   *
    * @param index Index into the paragraph that indicates the hyperlink to
    * change.
    */
   public LinkVisitor( final int index ) {
     this.offset = index;
+  }
   public Link process( final Node root ) {
     getVisitor().visit( root );
     return getLink();
+  }
   /**
+   *
    * @param link Not null.
    */
   private void visit( final Link link ) {
     final int began = link.getStartOffset();
     final int ended = link.getEndOffset();
     final int index = getOffset();
     if( index >= began && index <= ended ) {
       setLink( link );
+    }
+  }
   private synchronized NodeVisitor getVisitor() {
     if( this.visitor == null ) {
       this.visitor = createVisitor();
+    }
     return this.visitor;
+  }
   protected NodeVisitor createVisitor() {
     return new NodeVisitor(
       new VisitHandler<>( Link.class, LinkVisitor.this::visit ) );
+  }
   private Link getLink() {
     return this.link;
+  }
   private void setLink( final Link link ) {
     this.link = link;
+  }
   public int getOffset() {
     return this.offset;
+  }
+}

A src/main/java/com/scrivenvar/editors/markdown/MarkdownEditorPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.editors.markdown;
 import com.scrivenvar.dialogs.ImageDialog;
 import com.scrivenvar.dialogs.LinkDialog;
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.processors.MarkdownProcessor;
 import static com.scrivenvar.util.Utils.ltrim;
 import static com.scrivenvar.util.Utils.rtrim;
 import com.vladsch.flexmark.ast.Link;
 import com.vladsch.flexmark.ast.Node;
 import java.nio.file.Path;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.IndexRange;
 import static javafx.scene.input.KeyCode.ENTER;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Window;
 import org.fxmisc.richtext.StyleClassedTextArea;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static com.scrivenvar.Constants.STYLESHEET_MARKDOWN;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 /**
  * Markdown editor pane.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class MarkdownEditorPane extends EditorPane {
   private static final Pattern AUTO_INDENT_PATTERN = Pattern.compile(
     "(\\s*[*+-]\\s+|\\s*[0-9]+\\.\\s+|\\s+)(.*)" );
   public MarkdownEditorPane() {
     initEditor();
+  }
   private void initEditor() {
     final StyleClassedTextArea textArea = getEditor();
     textArea.setWrapText( true );
     textArea.getStyleClass().add( "markdown-editor" );
     textArea.getStylesheets().add(STYLESHEET_MARKDOWN );
     addEventListener( keyPressed( ENTER ), this::enterPressed );
     // TODO: Wait for implementation that allows cutting lines, not paragraphs.
 //    addEventListener( keyPressed( X, SHORTCUT_DOWN ), this::cutLine );
+  }
   public ObservableValue<String> markdownProperty() {
     return getEditor().textProperty();
+  }
   private void enterPressed( final KeyEvent e ) {
     final StyleClassedTextArea textArea = getEditor();
     final String currentLine = textArea.getText( textArea.getCurrentParagraph() );
     final Matcher matcher = AUTO_INDENT_PATTERN.matcher( currentLine );
     String newText = "\n";
     if( matcher.matches() ) {
       if( !matcher.group( 2 ).isEmpty() ) {
         // indent new line with same whitespace characters and list markers as current line
         newText = newText.concat( matcher.group( 1 ) );
       } else {
         // current line contains only whitespace characters and list markers
         // --> empty current line
         final int caretPosition = textArea.getCaretPosition();
         textArea.selectRange( caretPosition - currentLine.length(), caretPosition );
+      }
+    }
     textArea.replaceSelection( newText );
+  }
   public void surroundSelection( final String leading, final String trailing ) {
     surroundSelection( leading, trailing, null );
+  }
   public void surroundSelection( String leading, String trailing, final String hint ) {
     final StyleClassedTextArea textArea = getEditor();
     // Note: not using textArea.insertText() to insert leading and trailing
     // because this would add two changes to undo history
     final IndexRange selection = textArea.getSelection();
     int start = selection.getStart();
     int end = selection.getEnd();
     final String selectedText = textArea.getSelectedText();
     // remove leading and trailing whitespaces from selected text
     String trimmedSelectedText = selectedText.trim();
     if( trimmedSelectedText.length() < selectedText.length() ) {
       start += selectedText.indexOf( trimmedSelectedText );
       end = start + trimmedSelectedText.length();
+    }
     // remove leading whitespaces from leading text if selection starts at zero
     if( start == 0 ) {
       leading = ltrim( leading );
+    }
     // remove trailing whitespaces from trailing text if selection ends at text end
     if( end == textArea.getLength() ) {
       trailing = rtrim( trailing );
+    }
     // remove leading line separators from leading text
     // if there are line separators before the selected text
     if( leading.startsWith( "\n" ) ) {
       for( int i = start - 1; i >= 0 && leading.startsWith( "\n" ); i-- ) {
         if( !"\n".equals( textArea.getText( i, i + 1 ) ) ) {
           break;
+        }
         leading = leading.substring( 1 );
+      }
+    }
     // remove trailing line separators from trailing or leading text
     // if there are line separators after the selected text
     final boolean trailingIsEmpty = trailing.isEmpty();
     String str = trailingIsEmpty ? leading : trailing;
     if( str.endsWith( "\n" ) ) {
       final int length = textArea.getLength();
       for( int i = end; i < length && str.endsWith( "\n" ); i++ ) {
         if( !"\n".equals( textArea.getText( i, i + 1 ) ) ) {
           break;
+        }
         str = str.substring( 0, str.length() - 1 );
+      }
       if( trailingIsEmpty ) {
         leading = str;
       } else {
         trailing = str;
+      }
+    }
     int selStart = start + leading.length();
     int selEnd = end + leading.length();
     // insert hint text if selection is empty
     if( hint != null && trimmedSelectedText.isEmpty() ) {
       trimmedSelectedText = hint;
       selEnd = selStart + hint.length();
+    }
     // prevent undo merging with previous text entered by user
     getUndoManager().preventMerge();
     // replace text and update selection
     textArea.replaceText( start, end, leading + trimmedSelectedText + trailing );
     textArea.selectRange( selStart, selEnd );
+  }
   /**
    * Returns one of: selected text, word under cursor, or parsed hyperlink from
    * the markdown AST.
+   *
    * @return
    */
   private HyperlinkModel getHyperlink() {
     final StyleClassedTextArea textArea = getEditor();
     final String selectedText = textArea.getSelectedText();
     // Get the current paragraph, convert to Markdown nodes.
     final MarkdownProcessor mp = new MarkdownProcessor( null );
     final int p = textArea.getCurrentParagraph();
     final String paragraph = textArea.getText( p );
     final Node node = mp.toNode( paragraph );
     final LinkVisitor visitor = new LinkVisitor( textArea.getCaretColumn() );
     final Link link = visitor.process( node );
     if( link != null ) {
       textArea.selectRange( p, link.getStartOffset(), p, link.getEndOffset() );
+    }
     final HyperlinkModel model = createHyperlinkModel(
       link, selectedText, "https://website.com"
     );
     return model;
+  }
   private HyperlinkModel createHyperlinkModel(
     final Link link, final String selection, final String url ) {
     return link == null
       ? new HyperlinkModel( selection, url )
       : new HyperlinkModel( link );
+  }
   private Path getParentPath() {
     final Path parentPath = getPath();
     return (parentPath != null) ? parentPath.getParent() : null;
+  }
   private Dialog<String> createLinkDialog() {
     return new LinkDialog( getWindow(), getHyperlink(), getParentPath() );
+  }
   private Dialog<String> createImageDialog() {
     return new ImageDialog( getWindow(), getParentPath() );
+  }
   private void insertObject( final Dialog<String> dialog ) {
     dialog.showAndWait().ifPresent( result -> {
       getEditor().replaceSelection( result );
     } );
+  }
   public void insertLink() {
     insertObject( createLinkDialog() );
+  }
   public void insertImage() {
     insertObject( createImageDialog() );
+  }
   private Window getWindow() {
     return getScrollPane().getScene().getWindow();
+  }
+}

A src/main/java/com/scrivenvar/predicates/files/FileTypePredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.files;
 import java.io.File;
 import java.nio.file.FileSystems;
 import java.nio.file.PathMatcher;
 import java.util.Collection;
 import java.util.function.Predicate;
 /**
  * Responsible for testing whether a given path (to a file) matches one of the
  * filename extension patterns provided during construction.
+ *
  * @see http://docs.oracle.com/javase/tutorial/essential/io/find.html
+ *
  * @author White Magic Software, Ltd.
  */
 public class FileTypePredicate implements Predicate<File> {
   private final PathMatcher matcher;
   /**
    * Constructs a new instance given a set of file extension globs.
+   *
    * @param patterns Comma-separated list of globbed extensions including the
    * Kleene star (e.g., <code>*.md,*.markdown,*.txt</code>).
    */
   public FileTypePredicate( final String patterns ) {
     this.matcher = FileSystems.getDefault().getPathMatcher(
       "glob:**/{" + patterns + "}"
     );
+  }
   /**
    * Constructs a new instance given a list of file extension globs, each must
    * include the Kleene star (a.k.a. asterisk).
+   *
    * @param patterns Collection of globbed extensions.
    */
   public FileTypePredicate( final Collection<String> patterns ) {
     this( String.join( ",", patterns ) );
+  }
   /**
    * Returns true if the file matches the patterns defined during construction.
+   *
    * @param file The filename to match against the given glob patterns.
+   *
    * @return false The filename does not match the glob patterns.
    */
   @Override
   public boolean test( final File file ) {
     return getMatcher().matches( file.toPath() );
+  }
   private PathMatcher getMatcher() {
     return this.matcher;
+  }
+}

A src/main/java/com/scrivenvar/predicates/strings/ContainsPredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.strings;
 /**
  * Determines if one string contains another.
+ *
  * @author White Magic Software, Ltd.
  */
 public class ContainsPredicate extends StringPredicate {
   /**
    * Calls the superclass to construct the instance.
+   *
    * @param comparate Not null.
    */
   public ContainsPredicate( final String comparate ) {
     super( comparate );
+  }
   /**
    * Answers whether the given strings match each other. What match means will
    * depend on user preferences. The empty condition is required to return the
    * first node in a list of child nodes when the user has not yet selected a
    * node.
+   *
    * @param comparator The string to compare against the comparate.
+   *
    * @return true if s1 and s2 are a match according to some criteria,or s2 is
    * empty.
    */
   @Override
   public boolean test( final String comparator ) {
     final String comparate = getComparate().toLowerCase();
     return comparator.contains( comparate.toLowerCase() )
       || comparate.isEmpty();
+  }
+}

A src/main/java/com/scrivenvar/predicates/strings/EqualPredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.strings;
 /**
  * Determines if two strings are equal.
+ *
  * @author White Magic Software, Ltd.
  */
 public class EqualPredicate extends StringPredicate {
   /**
    * Calls the superclass to construct the instance.
+   *
    * @param comparate Not null.
    */
   public EqualPredicate( final String comparate ) {
     super( comparate );
+  }
   /**
    * Compares two strings.
+   *
    * @param comparator A non-null string, possibly empty.
+   *
    * @return true The strings are equal, ignoring case.
    */
   @Override
   public boolean test( final String comparator ) {
     return comparator.equalsIgnoreCase( getComparate() );
+  }
+}

A src/main/java/com/scrivenvar/predicates/strings/StartsPredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.strings;
 /**
  * Determines if a string starts with another.
+ *
  * @author White Magic Software, Ltd.
  */
 public class StartsPredicate extends StringPredicate {
   /**
    * Constructs a new instance using a comparate that will be compared with
    * the comparator during the test.
+   *
    * @param comparate The string to compare against the comparator.
    */
   public StartsPredicate( final String comparate ) {
     super( comparate );
+  }
   /**
    * Compares two strings.
+   *
    * @param comparator A non-null string, possibly empty.
+   *
    * @return true The comparator starts with the comparate, ignoring case.
    */
   @Override
   public boolean test( final String comparator ) {
     final String comparate = getComparate().toLowerCase();
     return comparator.startsWith( comparate.toLowerCase() );
+  }
+}

A src/main/java/com/scrivenvar/predicates/strings/StringPredicate.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.predicates.strings;
 import java.util.function.Predicate;
 /**
  * General predicate for different types of string comparisons.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class StringPredicate implements Predicate<String> {
   private final String comparate;
   public StringPredicate( final String comparate ) {
     this.comparate = comparate;
+  }
   protected String getComparate() {
     return this.comparate;
+  }
+}

A src/main/java/com/scrivenvar/preview/HTMLPreviewPane.java

 /*
  * Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preview;
 import static com.scrivenvar.Constants.CARET_POSITION_BASE;
 import static com.scrivenvar.Constants.STYLESHEET_PREVIEW;
 import java.nio.file.Path;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker.State;
 import static javafx.concurrent.Worker.State.SUCCEEDED;
 import javafx.scene.Node;
 import javafx.scene.layout.Pane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 /**
  * HTML preview pane is responsible for rendering an HTML document.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class HTMLPreviewPane extends Pane {
   private final WebView webView = new WebView();
   private Path path;
   /**
    * Creates a new preview pane that can scroll to the caret position within the
    * document.
    */
   public HTMLPreviewPane() {
     initListeners();
     initTraversal();
+  }
   /**
    * Initializes observers for document changes. When the document is reloaded
    * with new HTML, this triggers a scroll event that repositions the document
    * to the injected caret (that corresponds with the position in the text
    * editor).
    */
   private void initListeners() {
     // Scrolls to the caret after the content has been loaded.
     getEngine().getLoadWorker().stateProperty().addListener(
       (ObservableValue<? extends State> observable,
         final State oldValue, final State newValue) -> {
         if( newValue == SUCCEEDED ) {
           scrollToCaret();
+        }
       } );
+  }
   /**
    * Ensures images can be found relative to the document.
+   *
    * @return The base path element to use for the document, or the empty string
    * if no path has been set, yet.
    */
   private String getBase() {
     final Path basePath = getPath();
     return basePath == null
       ? ""
       : ("<base href='" + basePath.getParent().toUri().toString() + "'>");
+  }
   /**
    * Updates the internal HTML source, loads it into the preview pane, then
    * scrolls to the caret position.
+   *
    * @param html The new HTML document to display.
    */
   public void update( final String html ) {
     getEngine().loadContent(
       "<!DOCTYPE html>"
       + "<html>"
       + "<head>"
       + "<link rel='stylesheet' href='" + getClass().getResource( STYLESHEET_PREVIEW ) + "'>"
       + getBase()
       + "</head>"
       + "<body>"
       + html
       + "</body>"
       + "</html>" );
+  }
   /**
    * Clears out the HTML content from the preview.
    */
   public void clear() {
     update( "" );
+  }
   /**
    * Scrolls to the caret position in the document.
    */
   private void scrollToCaret() {
     execute( getScrollScript() );
+  }
   /**
    * Returns the JavaScript used to scroll the WebView pane.
+   *
    * @return A script that tries to center the view port on the CARET POSITION.
    */
   private String getScrollScript() {
     return ""
       + "var e = document.getElementById('" + CARET_POSITION_BASE + "');"
       + "if( e != null ) { "
       + "  Element.prototype.topOffset = function () {"
       + "    return this.offsetTop + (this.offsetParent ? this.offsetParent.topOffset() : 0);"
       + "  };"
       + "  window.scrollTo( 0, e.topOffset() - (window.innerHeight / 2 ) );"
       + "}";
+  }
   /**
    * Prevent tabbing into the preview pane.
    */
   private void initTraversal() {
     getWebView().setFocusTraversable( false );
+  }
   private Object execute( final String script ) {
     return getEngine().executeScript( script );
+  }
   private WebEngine getEngine() {
     return getWebView().getEngine();
+  }
   private WebView getWebView() {
     return this.webView;
+  }
   private Path getPath() {
     return this.path;
+  }
   public void setPath( final Path path ) {
     this.path = path;
+  }
   /**
    * Content to embed in a panel.
+   *
    * @return The content to display to the user.
    */
   public Node getNode() {
     return getWebView();
+  }
+}

A src/main/java/com/scrivenvar/processors/AbstractProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 /**
  * Responsible for transforming a document through a variety of chained
  * handlers. If there are conditions where this handler should not process the
  * entire chain, create a second handler, or split the chain into reusable
  * sub-chains.
+ *
  * @author White Magic Software, Ltd.
  * @param <T> The type of object to process.
  */
 public abstract class AbstractProcessor<T> implements Processor<T> {
   /**
    * Used while processing the entire chain; null to signify no more links.
    */
   private final Processor<T> next;
   /**
    * Constructs a succession without a successor (i.e., next is null).
    */
   protected AbstractProcessor() {
     this( null );
+  }
   /**
    * Constructs a new default handler with a given successor.
+   *
    * @param successor Use null to indicate last link in the chain.
    */
   public AbstractProcessor( final Processor<T> successor ) {
     this.next = successor;
+  }
   /**
    * Processes links in the chain while there are successors and valid data to
    * process.
+   *
    * @param t The object to process.
    */
   @Override
   public synchronized void processChain( T t ) {
     Processor<T> handler = this;
     while( handler != null && t != null ) {
       t = handler.processLink( t );
       handler = handler.next();
+    }
+  }
   @Override
   public Processor<T> next() {
     return this.next;
+  }
+}

A src/main/java/com/scrivenvar/processors/HTMLPreviewProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.scrivenvar.preview.HTMLPreviewPane;
 /**
  * Responsible for notifying the HTMLPreviewPane when the succession chain has
  * updated. This decouples knowledge of changes to the editor panel from the
  * HTML preview panel as well as any processing that takes place before the
  * final HTML preview is rendered. This should be the last link in the processor
  * chain.
+ *
  * @author White Magic Software, Ltd.
  */
 public class HTMLPreviewProcessor extends AbstractProcessor<String> {
   private HTMLPreviewPane htmlPreviewPane;
   /**
    * Constructs the end of a processing chain.
+   *
    * @param htmlPreviewPane The pane to update with the post-processed document.
    */
   public HTMLPreviewProcessor( final HTMLPreviewPane htmlPreviewPane ) {
     super( null );
     setHtmlPreviewPane( htmlPreviewPane );
+  }
   /**
    * Update the preview panel using HTML from the succession chain.
+   *
    * @param html The document content to render in the preview pane. The HTML
    * should not contain a doctype, head, or body tag, only content to render
    * within the body.
+   *
    * @return null
    */
   @Override
   public String processLink( final String html ) {
     getHtmlPreviewPane().update( html );
     // No more processing required.
     return null;
+  }
   private HTMLPreviewPane getHtmlPreviewPane() {
     return this.htmlPreviewPane;
+  }
   private void setHtmlPreviewPane( final HTMLPreviewPane htmlPreviewPane ) {
     this.htmlPreviewPane = htmlPreviewPane;
+  }
+}

A src/main/java/com/scrivenvar/processors/MarkdownCaretInsertionProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import static com.scrivenvar.Constants.CARET_POSITION_MD;
 import static java.lang.Character.isLetter;
 /**
  * Responsible for inserting the magic CARET POSITION into the markdown so that,
  * upon rendering into HTML, the HTML pane can scroll to the correct position
  * (relative to the caret position in the editor).
+ *
  * @author White Magic Software, Ltd.
  */
 public class MarkdownCaretInsertionProcessor extends AbstractProcessor<String> {
   private final int caretPosition;
   /**
    * Constructs a processor capable of inserting a caret marker into Markdown.
+   *
    * @param processor The next processor in the chain.
    * @param position The caret's current position in the text, cannot be null.
    */
   public MarkdownCaretInsertionProcessor(
     final Processor<String> processor, final int position ) {
     super( processor );
     this.caretPosition = position;
+  }
   /**
    * Changes the text to insert a "caret" at the caret position. This will
    * insert the unique key of Constants.MD_CARET_POSITION into the document.
+   *
    * @param t The document text to process.
+   *
    * @return The document text with the Markdown caret text inserted at the
    * caret position (given at construction time).
    */
   @Override
   public String processLink( final String t ) {
     int offset = getCaretPosition();
     final int length = t.length();
     // Insert the caret at the closest non-Markdown delimiter (i.e., the
     // closest character from the caret position forward).
     while( offset < length && !isLetter( t.charAt( offset ) ) ) {
       offset++;
+    }
     // TODO: Ensure that the caret position is outside of an element,
     // so that a caret inserted in the image doesn't corrupt it. Such as:
     //
     // ![Screenshot](images/scr|eenshot.png)
     // Insert the caret position into the Markdown text, but don't interfere
     // with the Markdown iteself.
     return new StringBuilder( t ).replace(
       offset, offset, CARET_POSITION_MD ).toString();
+  }
   /**
    * Returns the editor's caret position.
+   *
    * @return Where the user has positioned the caret.
    */
   private int getCaretPosition() {
     return this.caretPosition;
+  }
+}

A src/main/java/com/scrivenvar/processors/MarkdownCaretReplacementProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import static com.scrivenvar.Constants.CARET_POSITION_HTML;
 import static com.scrivenvar.Constants.CARET_POSITION_MD;
 /**
  * Responsible for replacing the caret position marker with an HTML element
  * suitable to use as a reference for scrolling a view port.
+ *
  * @author White Magic Software, Ltd.
  */
 public class MarkdownCaretReplacementProcessor extends AbstractProcessor<String> {
   private static final int INDEX_NOT_FOUND = -1;
   public MarkdownCaretReplacementProcessor( final Processor<String> processor ) {
     super( processor );
+  }
   /**
    * Replaces each MD_CARET_POSITION with an HTML element that has an id
    * attribute of CARET_POSITION. This should only replace one item.
+   *
    * @param t The text that contains
+   *
    * @return
    */
   @Override
   public String processLink( final String t ) {
     return replace(t, CARET_POSITION_MD, CARET_POSITION_HTML );
+  }
   /**
    * Replaces the needle with thread in the given haystack. Based on Apache
    * Commons 3 StringUtils.replace method. Should be faster than
    * String.replace, which performs a little regex under the hood.
+   *
    * @param haystack Search this string for the needle, must not be null.
    * @param needle The text to find in the haystack.
    * @param thread Replace the needle with this text, if the needle is found.
+   *
    * @return The haystack with the first instance of needle replaced with
    * thread.
    */
   private static String replace(
     final String haystack, final String needle, final String thread ) {
     final int end = haystack.indexOf( needle, 0 );
     if( end == INDEX_NOT_FOUND ) {
       return haystack;
+    }
     int start = 0;
     final int needleLength = needle.length();
     int increase = thread.length() - needleLength;
     increase = (increase < 0 ? 0 : increase);
     final StringBuilder buffer = new StringBuilder( haystack.length() + increase );
     if( end != INDEX_NOT_FOUND ) {
       buffer.append( haystack.substring( start, end ) ).append( thread );
       start = end + needleLength;
+    }
     return buffer.append( haystack.substring( start ) ).toString();
+  }
+}

A src/main/java/com/scrivenvar/processors/MarkdownProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.vladsch.flexmark.Extension;
 import com.vladsch.flexmark.ast.Node;
 import com.vladsch.flexmark.ext.gfm.tables.TablesExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import java.util.ArrayList;
 import java.util.List;
 /**
  * Responsible for parsing a Markdown document and rendering it as HTML.
+ *
  * @author White Magic Software, Ltd.
  */
 public class MarkdownProcessor extends AbstractProcessor<String> {
   private List<Extension> extensions;
   /**
    * Constructs a new Markdown processor that can create HTML documents.
+   *
    * @param successor Usually the HTML Preview Processor.
    */
   public MarkdownProcessor( final Processor<String> successor ) {
     super( successor );
+  }
   /**
    * Converts the given Markdown string into HTML, without the doctype, html,
    * head, and body tags.
+   *
    * @param markdown The string to convert from Markdown to HTML.
+   *
    * @return The HTML representation of the Markdown document.
    */
   @Override
   public String processLink( final String markdown ) {
     return toHtml( markdown );
+  }
   /**
    * Returns the AST in the form of a node for the given markdown document. This
    * can be used, for example, to determine if a hyperlink exists inside of a
    * paragraph.
+   *
    * @param markdown The markdown to convert into an AST.
+   *
    * @return The markdown AST for the given text (usually a paragraph).
    */
   public Node toNode( final String markdown ) {
     return parse( markdown );
+  }
   /**
    * Helper method to create an AST given some markdown.
+   *
    * @param markdown The markdown to parse.
+   *
    * @return The root node of the markdown tree.
    */
   private Node parse( final String markdown ) {
     return createParser().parse( markdown );
+  }
   /**
    * Converts a string of markdown into HTML.
+   *
    * @param markdown The markdown text to convert to HTML, must not be null.
+   *
    * @return The markdown rendered as an HTML document.
    */
   private String toHtml( final String markdown ) {
     return createRenderer().render( parse( markdown ) );
+  }
   /**
    * Returns the list of extensions to use when parsing and rendering Markdown
    * into HTML.
+   *
    * @return A non-null list of Markdown extensions.
    */
   private synchronized List<Extension> getExtensions() {
     if( this.extensions == null ) {
       this.extensions = createExtensions();
+    }
     return this.extensions;
+  }
   /**
    * Creates a list that includes a TablesExtension. Subclasses may override
    * this method to insert more extensions, or remove the table extension.
+   *
    * @return A list with an extension for parsing and rendering tables.
    */
   protected List<Extension> createExtensions() {
     final List<Extension> result = new ArrayList<>();
     result.add( TablesExtension.create() );
     return result;
+  }
   /**
    * Creates the Markdown document processor.
+   *
    * @return A Parser that can build an abstract syntax tree.
    */
   private Parser createParser() {
     return Parser.builder().extensions( getExtensions() ).build();
+  }
   /**
    * Creates the HTML document renderer.
+   *
    * @return A renderer that can convert a Markdown AST to HTML.
    */
   private HtmlRenderer createRenderer() {
     return HtmlRenderer.builder().extensions( getExtensions() ).build();
+  }
+}

A src/main/java/com/scrivenvar/processors/Processor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 /**
  * Responsible for processing documents from one known format to another.
+ *
  * @author White Magic Software, Ltd.
  * @param <T> The type of processor to create.
  */
 public interface Processor<T> {
   /**
    * Provided so that the chain can be invoked from any link using a given
    * value. This should be called automatically by a superclass so that
    * the links in the chain need only implement the processLink method.
+   *
    * @param t The value to pass along to each link in the chain.
    */
   public void processChain( T t );
   /**
    * Processes the given content providing a transformation from one document
    * format into another. For example, this could convert from XML to text using
    * an XSLT processor, or from markdown to HTML.
+   *
    * @param t The type of object to process.
+   *
    * @return The post-processed document, or null if processing should stop.
    */
   public T processLink( T t );
   /**
    * Adds a document processor to call after this processor finishes processing
    * the document given to the process method.
+   *
    * @return The processor that should transform the document after this
    * instance has finished processing.
    */
   public Processor<T> next();
+}

A src/main/java/com/scrivenvar/processors/VariableProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.scrivenvar.processors.text.TextReplacementFactory;
 import com.scrivenvar.processors.text.TextReplacer;
 import java.util.Map;
 /**
  * Processes variables in the document and inserts their values into the
  * post-processed text.
+ *
  * @author White Magic Software, Ltd.
  */
 public class VariableProcessor extends AbstractProcessor<String> {
   private Map<String, String> definitions;
   /**
    * Constructs a new Markdown processor that can create HTML documents.
+   *
    * @param successor Usually the HTML Preview Processor.
    */
   private VariableProcessor( final Processor<String> successor ) {
     super( successor );
+  }
   public VariableProcessor(
     final Processor<String> successor,
     final Map<String, String> map ) {
     this( successor );
     setDefinitions( map );
+  }
   /**
+   *
    * @param text The document text that includes variables that should be
    * replaced with values when rendered as HTML.
+   *
    * @return The text with all variables replaced.
    */
   @Override
   public String processLink( final String text ) {
     final TextReplacer tr = TextReplacementFactory.getTextReplacer( text.length() );
     return tr.replace( text, getDefinitions() );
+  }
   private Map<String, String> getDefinitions() {
     return this.definitions;
+  }
   private void setDefinitions( final Map<String, String> definitions ) {
     this.definitions = definitions;
+  }
+}

A src/main/java/com/scrivenvar/processors/text/AbstractTextReplacer.java

 /*
  * The MIT License
+ *
  * Copyright 2016 .
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 /**
  * Responsible for common behaviour across all text replacer implementations.
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class AbstractTextReplacer implements TextReplacer {
   /**
    * Default (empty) constructor.
    */
   protected AbstractTextReplacer() {
+  }
   protected String[] keys( final Map<String, String> map ) {
     return map.keySet().toArray( new String[ map.size() ] );
+  }
   protected String[] values( final Map<String, String> map ) {
     return map.values().toArray( new String[ map.size() ] );
+  }
+}

A src/main/java/com/scrivenvar/processors/text/AhoCorasickReplacer.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 import org.ahocorasick.trie.Emit;
 import org.ahocorasick.trie.Trie.TrieBuilder;
 import static org.ahocorasick.trie.Trie.builder;
 /**
  * Replaces text using an Aho-Corasick algorithm.
+ *
  * @author White Magic Software, Ltd.
  */
 public class AhoCorasickReplacer extends AbstractTextReplacer {
   /**
    * Default (empty) constructor.
    */
   protected AhoCorasickReplacer() {
+  }
   @Override
   public String replace( final String text, final Map<String, String> map ) {
     // Create a buffer sufficiently large that re-allocations are minimized.
     final StringBuilder sb = new StringBuilder( (int)(text.length() * 1.25) );
     // The TrieBuilder should only match whole words and ignore overlaps (there
     // shouldn't be any).
     final TrieBuilder builder = builder().onlyWholeWords().removeOverlaps();
     for( final String key : keys( map ) ) {
       builder.addKeyword( key );
+    }
     int index = 0;
     for( final Emit emit : builder.build().parseText( text ) ) {
       sb.append( text.substring( index, emit.getStart() ) );
       sb.append( map.get( emit.getKeyword() ) );
       index = emit.getEnd() + 1;
+    }
     // Add the remainder of the string (contains no more matches).
     sb.append( text.substring( index ) );
     return sb.toString();
+  }
+}

A src/main/java/com/scrivenvar/processors/text/StringUtilsReplacer.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 import static org.apache.commons.lang.StringUtils.replaceEach;
 /**
  * Replaces text using Apache's StringUtils.replaceEach method.
+ *
  * @author White Magic Software, Ltd.
  */
 public class StringUtilsReplacer extends AbstractTextReplacer {
   /**
    * Default (empty) constructor.
    */
   protected StringUtilsReplacer() {
+  }
   @Override
   public String replace( final String text, final Map<String, String> map ) {
     return replaceEach( text, keys( map ), values( map ) );
+  }
+}

A src/main/java/com/scrivenvar/processors/text/TextReplacementFactory.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 /**
  * Used to generate a class capable of efficiently replacing variable
  * definitions with their values.
+ *
  * @author White Magic Software, Ltd.
  */
 public class TextReplacementFactory {
   /**
    * Returns a text search/replacement instance that is reasonably optimal for
    * the given length of text.
+   *
    * @param length The length of text that requires some search and replacing.
+   *
    * @return A class that can search and replace text with utmost expediency.
    */
   public static TextReplacer getTextReplacer( final int length ) {
     // After about 1,500 characters, the StringUtils implementation is less
     // performant than the Aho-Corsick implementation.
     //
     // Ssee http://stackoverflow.com/a/40836618/59087
     return length < 1500
       ? new StringUtilsReplacer()
       : new AhoCorasickReplacer();
+  }
+}

A src/main/java/com/scrivenvar/processors/text/TextReplacer.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.text;
 import java.util.Map;
 /**
  * Defines the ability to replace text given a set of keys and values.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface TextReplacer {
   /**
    * Searches through the given text for any of the keys given in the map and
    * replaces the keys that appear in the text with the key's corresponding
    * value.
+   *
    * @param text The text that contains zero or more keys.
    * @param map The set of keys mapped to replacement values.
+   *
    * @return The given text with all keys replaced with corresponding values.
    */
   public String replace( String text, Map<String, String> map );
+}

A src/main/java/com/scrivenvar/service/Configuration.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 /**
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Configuration extends Service {
   public Settings getSettings();
   public Options getOptions();
+}

A src/main/java/com/scrivenvar/service/Options.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 import java.util.prefs.Preferences;
 /**
  * Responsible for persistent options.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Options {
   public Preferences getState();
   /**
    * Stores the key and value into the user preferences to be loaded the next
    * time the application is launched.
+   *
    * @param key Name of the key to persist along with its value.
    * @param value Value to associate with the key.
    */
   public void put( String key, String value );
   /**
    * Retrieves the value for a key in the user preferences.
+   *
    * @param key Retrieve the value of this key.
    * @param defaultValue The value to return in the event that the given key has
    * no associated value.
+   *
    * @return The value associated with the key.
    */
   public String get( String key, String defaultValue );
+}

A src/main/java/com/scrivenvar/service/Service.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 /**
  * All services inherit from this one.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Service {
+}

A src/main/java/com/scrivenvar/service/Settings.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service;
 import java.util.Iterator;
 import java.util.List;
 /**
  * Defines how settings and options can be retrieved.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Settings extends Service {
   /**
    * Returns a setting property or its default value.
+   *
    * @param property The property key name to obtain its value.
    * @param defaultValue The default value to return iff the property cannot be
    * found.
+   *
    * @return The property value for the given property key.
    */
   public String getSetting( String property, String defaultValue );
   /**
    * Returns a setting property or its default value.
+   *
    * @param property The property key name to obtain its value.
    * @param defaultValue The default value to return iff the property cannot be
    * found.
+   *
    * @return The property value for the given property key.
    */
   public int getSetting( String property, int defaultValue );
   /**
    * Returns a setting property or its default value.
+   *
    * @param property The property key name to obtain its value.
    * @param defaults The default values to return iff the property cannot be
    * found.
+   *
    * @return The property values for the given property key.
    */
   public List<Object> getSettingList( String property, List<String> defaults );
   /**
    * Returns a list of property names that begin with the given prefix. The
    * prefix is included in any matching results. This will return keys that
    * either match the prefix or start with the prefix followed by a dot ('.').
    * For example, a prefix value of <code>the.property.name</code> will likely
    * return the expected results, but <code>the.property.name.</code> (note the
    * extraneous period) will probably not.
+   *
    * @param prefix The prefix to compare against each property name.
+   *
    * @return The list of property names that have the given prefix.
    */
   public Iterator<String> getKeys( final String prefix );
   /**
    * Convert the generic list of property objects into strings.
+   *
    * @param property The property value to coerce.
    * @param defaults The defaults values to use should the property be unset.
+   *
    * @return The list of properties coerced from objects to strings.
    */
   public List<String> getStringSettingList( String property, List<String> defaults );
   /**
    * Converts the generic list of property objects into strings.
+   *
    * @param property The property value to coerce.
+   *
    * @return The list of properties coerced from objects to strings.
    */
   public List<String> getStringSettingList( String property );
+}

A src/main/java/com/scrivenvar/service/events/AlertMessage.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events;
 /**
+ *
  * @author White Magic Software, Ltd.
  */
 public interface AlertMessage {
   /**
    * Dialog box title.
+   *
    * @return A non-null string to use as the title for the dialog.
    */
   public String getTitle();
   /**
    * Dialog box message content.
+   *
    * @return A non-null string to use as the alert message for the dialog.
    */
   public String getContent();
+}

A src/main/java/com/scrivenvar/service/events/AlertService.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.stage.Window;
 /**
  * Provides the application with a uniform way to create alert dialogs.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface AlertService {
   public static final ButtonType YES = ButtonType.YES;
   public static final ButtonType NO = ButtonType.NO;
   public static final ButtonType CANCEL = ButtonType.CANCEL;
   /**
    * Called to set the window used as the parent for the alert dialogs.
+   *
    * @param window
    */
   public void setWindow( Window window );
   /**
    * Constructs a default alert message text for a modal alert dialog.
+   *
    * @param title The dialog box message title.
    * @param message The dialog box message content (needs formatting).
    * @param args The arguments to the message content that must be formatted.
+   *
    * @return The message suitable for building a modal alert dialog.
    */
   public AlertMessage createAlertMessage(
     String title,
     String message,
     Object... args );
   /**
    * Creates an alert of alert type error with a message showing the cause of
    * the error.
+   *
    * @param alertMessage The error message, title, and possibly more details.
+   *
    * @return A modal alert dialog box ready to display using showAndWait.
    */
   public Alert createAlertError( AlertMessage alertMessage );
   /**
    * Creates an alert of alert type confirmation with Yes/No/Cancel buttons.
+   *
    * @param alertMessage The message, title, and possibly more details.
+   *
    * @return A modal alert dialog box ready to display using showAndWait.
    */
   public Alert createAlertConfirmation( AlertMessage alertMessage );
+}

A src/main/java/com/scrivenvar/service/events/impl/ButtonOrderPane.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events.impl;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.Settings;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonBar;
 import static javafx.scene.control.ButtonBar.BUTTON_ORDER_WINDOWS;
 import javafx.scene.control.DialogPane;
 /**
  * Ensures a consistent button order for alert dialogs across platforms (because
  * the default button order on Linux defies all logic).
+ *
  * @author White Magic Software, Ltd.
  */
 public class ButtonOrderPane extends DialogPane {
   @Override
   protected Node createButtonBar() {
     final ButtonBar node = (ButtonBar)super.createButtonBar();
     node.setButtonOrder( getButtonOrder() );
     return node;
+  }
   private String getButtonOrder() {
     return getSetting( "dialog.alert.button.order.windows", BUTTON_ORDER_WINDOWS );
+  }
   private String getSetting( final String key, final String defaultValue ) {
     return getSettings().getSetting( key, defaultValue );
+  }
   private Settings getSettings() {
     return Services.load( Settings.class );
+  }
+}

A src/main/java/com/scrivenvar/service/events/impl/DefaultAlertMessage.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events.impl;
 import com.scrivenvar.service.events.AlertMessage;
 import java.text.MessageFormat;
 /**
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefaultAlertMessage implements AlertMessage {
   private final String title;
   private final String content;
   /**
    * Constructs a default alert message text for an alert modal dialog.
+   *
    * @param title The dialog box message title.
    * @param message The dialog box message content (needs formatting).
    * @param args The arguments to the message content that must be formatted.
    */
   public DefaultAlertMessage(
     final String title,
     final String message,
     final Object... args ) {
     this.title = title;
     this.content = MessageFormat.format( message, args );
+  }
   @Override
   public String getTitle() {
     return this.title;
+  }
   @Override
   public String getContent() {
     return this.content;
+  }
+}

A src/main/java/com/scrivenvar/service/events/impl/DefaultAlertService.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.events.impl;
 import com.scrivenvar.service.events.AlertMessage;
 import com.scrivenvar.service.events.AlertService;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import static javafx.scene.control.Alert.AlertType.CONFIRMATION;
 import static javafx.scene.control.Alert.AlertType.ERROR;
 import javafx.stage.Window;
 /**
  * Provides the ability to create error alert boxes.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class DefaultAlertService implements AlertService {
   private Window window;
   public DefaultAlertService() {
+  }
   public DefaultAlertService( final Window window ) {
     this.window = window;
+  }
   @Override
   public AlertMessage createAlertMessage(
     final String title,
     final String message,
     final Object... args ) {
     return new DefaultAlertMessage( title, message, args );
+  }
   private Alert createAlertDialog(
     final AlertType alertType,
     final AlertMessage message ) {
     final Alert alert = new Alert( alertType );
     alert.setDialogPane( new ButtonOrderPane() );
     alert.setTitle( message.getTitle() );
     alert.setHeaderText( null );
     alert.setContentText( message.getContent() );
     alert.initOwner( getWindow() );
     return alert;
+  }
   @Override
   public Alert createAlertConfirmation( final AlertMessage message ) {
     final Alert alert = createAlertDialog( CONFIRMATION, message );
     alert.getButtonTypes().setAll( YES, NO, CANCEL );
     return alert;
+  }
   @Override
   public Alert createAlertError( final AlertMessage message ) {
     return createAlertDialog( ERROR, message );
+  }
   private Window getWindow() {
     return this.window;
+  }
   @Override
   public void setWindow( Window window ) {
     this.window = window;
+  }
+}

A src/main/java/com/scrivenvar/service/events/impl/FileType.java

 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 package com.scrivenvar.service.events.impl;
 /**
  * Lists known file types for creating document processors via the factory.
+ *
  * @author White Magic Software, Ltd.
  */
 public enum FileType {
   MARKDOWN("md", "markdown", "mkdown", "mdown", "mkdn", "mkd", "mdwn", "mdtxt", "mdtext", "text", "txt"),
   R_MARKDOWN("Rmd"),
   XML("xml");
   private final String[] extensions;
   private FileType(final String... extensions) {
     this.extensions = extensions;
+  }
   /**
    * Returns true if the given file type aligns with the extension for this
    * enumeration.
+   *
    * @param filetype The file extension to compare against the internal list.
    * @return true The given filetype equals (case insensitive) the internal
    * type.
    */
   public boolean isType(final String filetype) {
     boolean result = false;
     for (final String extension : this.extensions) {
       if (extension.equalsIgnoreCase(filetype)) {
         result = true;
         break;
+      }
+    }
     return result;
+  }
+}

A src/main/java/com/scrivenvar/service/impl/DefaultOptions.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.impl;
 import static com.scrivenvar.Constants.PREFS_ROOT;
 import static com.scrivenvar.Constants.PREFS_ROOT_OPTIONS;
 import static com.scrivenvar.Constants.PREFS_ROOT_STATE;
 import com.scrivenvar.service.Options;
 import java.util.prefs.Preferences;
 import static java.util.prefs.Preferences.userRoot;
 /**
  * Persistent options user can change at runtime.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class DefaultOptions implements Options {
   private Preferences preferences;
   public DefaultOptions() {
     setPreferences( getRootPreferences().node( PREFS_ROOT_OPTIONS ) );
+  }
   @Override
   public void put( final String key, final String value ) {
     getPreferences().put( key, value );
+  }
   @Override
   public String get( final String key, final String defalutValue ) {
     return getPreferences().get( key, defalutValue );
+  }
   private void setPreferences( final Preferences preferences ) {
     this.preferences = preferences;
+  }
   private Preferences getRootPreferences() {
     return userRoot().node( PREFS_ROOT );
+  }
   @Override
   public Preferences getState() {
     return getRootPreferences().node( PREFS_ROOT_STATE );
+  }
   private Preferences getPreferences() {
     return this.preferences;
+  }
+}

A src/main/java/com/scrivenvar/service/impl/DefaultSettings.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.service.impl;
 import static com.scrivenvar.Constants.SETTINGS_NAME;
 import com.scrivenvar.service.Settings;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 /**
  * Responsible for loading settings that help avoid hard-coded assumptions.
+ *
  * @author White Magic Software, Ltd.
  */
 public class DefaultSettings implements Settings {
   private PropertiesConfiguration properties;
   public DefaultSettings()
     throws ConfigurationException, URISyntaxException, IOException {
     setProperties( createProperties() );
+  }
   /**
    * Returns the value of a string property.
+   *
    * @param property The property key.
    * @param defaultValue The value to return if no property key has been set.
+   *
    * @return The property key value, or defaultValue when no key found.
    */
   @Override
   public String getSetting( final String property, final String defaultValue ) {
     return getSettings().getString( property, defaultValue );
+  }
   /**
    * Returns the value of a string property.
+   *
    * @param property The property key.
    * @param defaultValue The value to return if no property key has been set.
+   *
    * @return The property key value, or defaultValue when no key found.
    */
   @Override
   public int getSetting( final String property, final int defaultValue ) {
     return getSettings().getInt( property, defaultValue );
+  }
   /**
    * Returns a list of objects for a given setting.
+   *
    * @param property The setting key name.
    * @param defaults The default values to return, which may be null.
+   *
    * @return A list, possibly empty, never null.
    */
   @Override
   public List<Object> getSettingList( final String property, List<String> defaults ) {
     if( defaults == null ) {
       defaults = new ArrayList<>();
+    }
     return getSettings().getList( property, defaults );
+  }
   /**
    * Convert the generic list of property objects into strings.
+   *
    * @param property The property value to coerce.
    * @param defaults The defaults values to use should the property be unset.
+   *
    * @return The list of properties coerced from objects to strings.
    */
   @Override
   public List<String> getStringSettingList(
     final String property, final List<String> defaults ) {
     final List<Object> settings = getSettingList( property, defaults );
     return settings.stream()
       .map( object -> Objects.toString( object, null ) )
       .collect( Collectors.toList() );
+  }
   /**
    * Convert a list of property objects into strings, with no default value.
+   *
    * @param property The property value to coerce.
+   *
    * @return The list of properties coerced from objects to strings.
    */
   @Override
   public List<String> getStringSettingList( final String property ) {
     return getStringSettingList( property, null );
+  }
   /**
    * Returns a list of property names that begin with the given prefix.
+   *
    * @param prefix The prefix to compare against each property name.
+   *
    * @return The list of property names that have the given prefix.
    */
   @Override
   public Iterator<String> getKeys( final String prefix ) {
     return getSettings().getKeys( prefix );
+  }
   private PropertiesConfiguration createProperties()
     throws ConfigurationException {
     final URL url = getPropertySource();
     return url == null
       ? new PropertiesConfiguration()
       : new PropertiesConfiguration( url );
+  }
   private URL getPropertySource() {
     return getClass().getResource( getSettingsFilename() );
+  }
   private String getSettingsFilename() {
     return SETTINGS_NAME;
+  }
   private void setProperties( final PropertiesConfiguration configuration ) {
     this.properties = configuration;
+  }
   private PropertiesConfiguration getSettings() {
     return this.properties;
+  }
+}

A src/main/java/com/scrivenvar/test/TestDefinitionPane.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.test;
 import com.scrivenvar.definition.DefinitionPane;
 import static javafx.application.Application.launch;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.stage.Stage;
 /**
  * TestDefinitionPane application for debugging.
  */
 public final class TestDefinitionPane extends TestHarness {
   /**
    * Application entry point.
+   *
    * @param stage The primary application stage.
+   *
    * @throws Exception Could not read configuration file.
    */
   @Override
   public void start( final Stage stage ) throws Exception {
     super.start( stage );
     TreeView<String> root = createTreeView();
     DefinitionPane pane = createDefinitionPane( root );
     test( pane, "language.ai.", "article" );
     test( pane, "language.ai", "ai" );
     test( pane, "l", "location" );
     test( pane, "la", "language" );
     test( pane, "c.p.n", "name" );
     test( pane, "c.p.n.", "First" );
     test( pane, "...", "c" );
     test( pane, "foo", "c" );
     test( pane, "foo.bar", "c" );
     test( pane, "", "c" );
     test( pane, "c", "protagonist" );
     test( pane, "c.", "protagonist" );
     test( pane, "c.p", "protagonist" );
     test( pane, "c.protagonist", "protagonist" );
     System.exit( 0 );
+  }
   private void test( DefinitionPane pane, String path, String value ) {
     System.out.println( "---------------------------" );
     System.out.println( "Find Path: '" + path + "'" );
     final TreeItem<String> node = pane.findNode( path );
     System.out.println( "Path Node: " + node );
     System.out.println( "Node Val : " + node.getValue() );
+  }
   public static void main( String[] args ) {
     launch( args );
+  }
+}

A src/main/java/com/scrivenvar/test/TestHarness.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.test;
 import static com.scrivenvar.Messages.get;
 import com.scrivenvar.definition.DefinitionPane;
 import com.scrivenvar.definition.yaml.YamlParser;
 import com.scrivenvar.definition.yaml.YamlTreeAdapter;
 import java.io.IOException;
 import java.io.InputStream;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.control.TreeView;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.StyleClassedTextArea;
 /**
  * TestDefinitionPane application for debugging and head-banging.
  */
 public abstract class TestHarness extends Application {
   private static Application app;
   private Scene scene;
   /**
    * Application entry point.
+   *
    * @param stage The primary application stage.
+   *
    * @throws Exception Could not read configuration file.
    */
   @Override
   public void start( final Stage stage ) throws Exception {
     initApplication();
     initScene();
     initStage( stage );
+  }
   protected TreeView<String> createTreeView() throws IOException {
     return new YamlTreeAdapter( new YamlParser() ).adapt(
       asStream( "/com/scrivenvar/variables.yaml" ),
       get( "Pane.defintion.node.root.title" )
     );
+  }
   protected DefinitionPane createDefinitionPane( TreeView<String> root ) {
     return new DefinitionPane( root );
+  }
   private void initApplication() {
     app = this;
+  }
   private void initScene() {
     final StyleClassedTextArea editor = new StyleClassedTextArea( false );
     final VirtualizedScrollPane<StyleClassedTextArea> scrollPane = new VirtualizedScrollPane<>( editor );
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setCenter( scrollPane );
     setScene( new Scene( borderPane ) );
+  }
   private void initStage( Stage stage ) {
     stage.setScene( getScene() );
+  }
   private Scene getScene() {
     return this.scene;
+  }
   private void setScene( Scene scene ) {
     this.scene = scene;
+  }
   private static Application getApplication() {
     return app;
+  }
   public static void showDocument( String uri ) {
     getApplication().getHostServices().showDocument( uri );
+  }
   protected InputStream asStream( String resource ) {
     return getClass().getResourceAsStream( resource );
+  }
+}

A src/main/java/com/scrivenvar/test/TestVariableNameProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.test;
 import com.scrivenvar.definition.VariableTreeItem;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import static java.util.concurrent.ThreadLocalRandom.current;
 import java.util.concurrent.TimeUnit;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static javafx.application.Application.launch;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.stage.Stage;
 import org.ahocorasick.trie.*;
 import org.ahocorasick.trie.Trie.TrieBuilder;
 import static org.apache.commons.lang.RandomStringUtils.randomNumeric;
 import org.apache.commons.lang.StringUtils;
 /**
  * Tests substituting variable definitions with their values in a swath of text.
+ *
  * @author White Magic Software, Ltd.
  */
 public class TestVariableNameProcessor extends TestHarness {
   private final static int TEXT_SIZE = 1000000;
   private final static int MATCHES_DIVISOR = 1000;
   private final static StringBuilder SOURCE
     = new StringBuilder( randomNumeric( TEXT_SIZE ) );
   private final static boolean DEBUG = false;
   public TestVariableNameProcessor() {
+  }
   @Override
   public void start( final Stage stage ) throws Exception {
     super.start( stage );
     final TreeView<String> treeView = createTreeView();
     final Map<String, String> definitions = new HashMap<>();
     populate( treeView.getRoot(), definitions );
     injectVariables( definitions );
     final String text = SOURCE.toString();
     show( text );
     long duration = System.nanoTime();
     // TODO: Test replaceEach (with intercoluated variables) and replaceEachRepeatedly
     // (without intercoluation).
     final String result = testBorAhoCorasick( text, definitions );
     duration = System.nanoTime() - duration;
     show( result );
     System.out.println( elapsed( duration ) );
     System.exit( 0 );
+  }
   private void show( final String s ) {
     if( DEBUG ) {
       System.out.printf( "%s\n\n", s );
+    }
+  }
   private String testBorAhoCorasick(
     final String text,
     final Map<String, String> definitions ) {
     // Create a buffer sufficiently large that re-allocations are minimized.
     final StringBuilder sb = new StringBuilder( text.length() << 1 );
     final TrieBuilder builder = Trie.builder();
     builder.onlyWholeWords();
     builder.removeOverlaps();
     final String[] keys = keys( definitions );
     for( final String key : keys ) {
       builder.addKeyword( key );
+    }
     final Trie trie = builder.build();
     final Collection<Emit> emits = trie.parseText( text );
     int prevIndex = 0;
     for( final Emit emit : emits ) {
       final int matchIndex = emit.getStart();
       sb.append( text.substring( prevIndex, matchIndex ) );
       sb.append( definitions.get( emit.getKeyword() ) );
       prevIndex = emit.getEnd() + 1;
+    }
     // Add the remainder of the string (contains no more matches).
     sb.append( text.substring( prevIndex ) );
     return sb.toString();
+  }
   private String testStringUtils(
     final String text, final Map<String, String> definitions ) {
     final String[] keys = keys( definitions );
     final String[] values = values( definitions );
     return StringUtils.replaceEach( text, keys, values );
+  }
   private String[] keys( final Map<String, String> definitions ) {
     final int size = definitions.size();
     return definitions.keySet().toArray( new String[ size ] );
+  }
   private String[] values( final Map<String, String> definitions ) {
     final int size = definitions.size();
     return definitions.values().toArray( new String[ size ] );
+  }
   /**
    * Decomposes a period of time into days, hours, minutes, seconds,
    * milliseconds, and nanoseconds.
+   *
    * @param duration Time in nanoseconds.
+   *
    * @return A non-null, comma-separated string (without newline).
    */
   public String elapsed( long duration ) {
     final TimeUnit scale = NANOSECONDS;
     long days = scale.toDays( duration );
     duration -= DAYS.toMillis( days );
     long hours = scale.toHours( duration );
     duration -= HOURS.toMillis( hours );
     long minutes = scale.toMinutes( duration );
     duration -= MINUTES.toMillis( minutes );
     long seconds = scale.toSeconds( duration );
     duration -= SECONDS.toMillis( seconds );
     long millis = scale.toMillis( duration );
     duration -= MILLISECONDS.toMillis( seconds );
     long nanos = scale.toNanos( duration );
     return String.format(
       "%d days, %d hours, %d minutes, %d seconds, %d millis, %d nanos",
       days, hours, minutes, seconds, millis, nanos
     );
+  }
   private void injectVariables( final Map<String, String> definitions ) {
     for( int i = (SOURCE.length() / MATCHES_DIVISOR) + 1; i > 0; i-- ) {
       final int r = current().nextInt( 1, SOURCE.length() );
       SOURCE.insert( r, randomKey( definitions ) );
+    }
+  }
   private String randomKey( final Map<String, String> map ) {
     final Object[] keys = map.keySet().toArray();
     final int r = current().nextInt( keys.length );
     return keys[ r ].toString();
+  }
   private void populate( final TreeItem<String> parent, final Map<String, String> map ) {
     for( final TreeItem<String> child : parent.getChildren() ) {
       if( child.isLeaf() ) {
         final String key = asDefinition( ((VariableTreeItem<String>)child).toPath() );
         final String value = child.getValue();
         map.put( key, value );
       } else {
         populate( child, map );
+      }
+    }
+  }
   private String asDefinition( final String key ) {
     return "$" + key + "$";
+  }
   public static void main( String[] args ) {
     launch( args );
+  }
+}

A src/main/java/com/scrivenvar/util/Action.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.input.KeyCombination;
 import de.jensd.fx.glyphs.GlyphIcons;
 /**
  * Simple action class
+ *
  * @author Karl Tauber
  */
 public class Action
+{
 	public final String text;
 	public final KeyCombination accelerator;
 	public final GlyphIcons icon;
 	public final EventHandler<ActionEvent> action;
 	public final ObservableBooleanValue disable;
 	public Action(String text, String accelerator, GlyphIcons icon,
 		EventHandler<ActionEvent> action)
+	{
 		this(text, accelerator, icon, action, null);
+	}
 	public Action(String text, String accelerator, GlyphIcons icon,
 		EventHandler<ActionEvent> action, ObservableBooleanValue disable)
+	{
 		this.text = text;
 		this.accelerator = (accelerator != null) ? KeyCombination.valueOf(accelerator) : null;
 		this.icon = icon;
 		this.action = action;
 		this.disable = disable;
+	}
+}

A src/main/java/com/scrivenvar/util/ActionUtils.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Separator;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.Tooltip;
 /**
  * Action utilities
+ *
  * @author Karl Tauber
  */
 public class ActionUtils {
   public static Menu createMenu( final String text, final Action... actions ) {
     return new Menu( text, null, createMenuItems( actions ) );
+  }
   public static MenuItem[] createMenuItems( Action... actions ) {
     MenuItem[] menuItems = new MenuItem[ actions.length ];
     for( int i = 0; i < actions.length; i++ ) {
       menuItems[ i ] = (actions[ i ] != null)
         ? createMenuItem( actions[ i ] )
         : new SeparatorMenuItem();
+    }
     return menuItems;
+  }
   public static MenuItem createMenuItem( Action action ) {
     MenuItem menuItem = new MenuItem( action.text );
     if( action.accelerator != null ) {
       menuItem.setAccelerator( action.accelerator );
+    }
     if( action.icon != null ) {
       menuItem.setGraphic( FontAwesomeIconFactory.get().createIcon( action.icon ) );
+    }
     menuItem.setOnAction( action.action );
     if( action.disable != null ) {
       menuItem.disableProperty().bind( action.disable );
+    }
     menuItem.setMnemonicParsing( true );
     return menuItem;
+  }
   public static ToolBar createToolBar( Action... actions ) {
     return new ToolBar( createToolBarButtons( actions ) );
+  }
   public static Node[] createToolBarButtons( Action... actions ) {
     Node[] buttons = new Node[ actions.length ];
     for( int i = 0; i < actions.length; i++ ) {
       buttons[ i ] = (actions[ i ] != null)
         ? createToolBarButton( actions[ i ] )
         : new Separator();
+    }
     return buttons;
+  }
   public static Button createToolBarButton( Action action ) {
     Button button = new Button();
     button.setGraphic( FontAwesomeIconFactory.get().createIcon( action.icon, "1.2em" ) );
     String tooltip = action.text;
     if( tooltip.endsWith( "..." ) ) {
       tooltip = tooltip.substring( 0, tooltip.length() - 3 );
+    }
     if( action.accelerator != null ) {
       tooltip += " (" + action.accelerator.getDisplayText() + ')';
+    }
     button.setTooltip( new Tooltip( tooltip ) );
     button.setFocusTraversable( false );
     button.setOnAction( action.action );
     if( action.disable != null ) {
       button.disableProperty().bind( action.disable );
+    }
     return button;
+  }
+}

A src/main/java/com/scrivenvar/util/Item.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 /**
  * Simple item for a ChoiceBox, ComboBox or ListView. Consists of a string name
  * and a value object. toString() returns the name. equals() compares the value
  * and hashCode() returns the hash code of the value.
+ *
  * @author Karl Tauber
  * @param <V> The type of item value.
  */
 public class Item<V> {
   public final String name;
   public final V value;
   public Item( final String name, final V value ) {
     this.name = name;
     this.value = value;
+  }
   @Override
   public boolean equals( final Object obj ) {
     if( this == obj ) {
       return true;
+    }
     if( !(obj instanceof Item) ) {
       return false;
+    }
     return Utils.safeEquals( value, ((Item<?>)obj).value );
+  }
   @Override
   public int hashCode() {
     return (value != null) ? value.hashCode() : 0;
+  }
   @Override
   public String toString() {
     return name;
+  }
+}

A src/main/java/com/scrivenvar/util/Lists.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import java.util.List;
 /**
  * Convenience class that provides a clearer API for obtaining list elements.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class Lists {
   private Lists() {
+  }
   /**
    * Returns the first item in the given list, or null if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a first item.
+   *
    * @return null if the list is null or there is no first item.
    */
   public static <T> T getFirst( final List<T> list ) {
     return getFirst( list, null );
+  }
   /**
    * Returns the last item in the given list, or null if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a last item.
+   *
    * @return null if the list is null or there is no last item.
    */
   public static <T> T getLast( final List<T> list ) {
     return getLast( list, null );
+  }
   /**
    * Returns the first item in the given list, or t if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a first item.
    * @param t The default return value.
+   *
    * @return null if the list is null or there is no first item.
    */
   public static <T> T getFirst( final List<T> list, final T t ) {
     return isEmpty( list ) ? t : list.get( 0 );
+  }
   /**
    * Returns the last item in the given list, or t if not found.
+   *
    * @param <T> The generic list type.
    * @param list The list that may have a last item.
    * @param t The default return value.
+   *
    * @return null if the list is null or there is no last item.
    */
   public static <T> T getLast( final List<T> list, final T t ) {
     return isEmpty( list ) ? t : list.get( list.size() - 1 );
+  }
   /**
    * Returns true if the given list is null or empty.
+   *
    * @param <T> The generic list type.
    * @param list The list that has a last item.
+   *
    * @return true The list is empty.
    */
   public static <T> boolean isEmpty( final List<T> list ) {
     return list == null || list.isEmpty();
+  }
+}

A src/main/java/com/scrivenvar/util/StageState.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import java.util.prefs.Preferences;
 import javafx.application.Platform;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 /**
  * Saves and restores Stage state (window bounds, maximized, fullScreen).
+ *
  * @author Karl Tauber
  */
 public class StageState {
   public static final String K_PANE_SPLIT_DEFINITION = "pane.split.definition";
   public static final String K_PANE_SPLIT_EDITOR = "pane.split.editor";
   public static final String K_PANE_SPLIT_PREVIEW = "pane.split.preview";
   private final Stage stage;
   private final Preferences state;
   private Rectangle normalBounds;
   private boolean runLaterPending;
   public StageState( final Stage stage, final Preferences state ) {
     this.stage = stage;
     this.state = state;
     restore();
     stage.addEventHandler( WindowEvent.WINDOW_HIDING, e -> save() );
     stage.xProperty().addListener( (ob, o, n) -> boundsChanged() );
     stage.yProperty().addListener( (ob, o, n) -> boundsChanged() );
     stage.widthProperty().addListener( (ob, o, n) -> boundsChanged() );
     stage.heightProperty().addListener( (ob, o, n) -> boundsChanged() );
+  }
   private void save() {
     final Rectangle bounds = isNormalState() ? getStageBounds() : normalBounds;
     if( bounds != null ) {
       state.putDouble( "windowX", bounds.getX() );
       state.putDouble( "windowY", bounds.getY() );
       state.putDouble( "windowWidth", bounds.getWidth() );
       state.putDouble( "windowHeight", bounds.getHeight() );
+    }
     state.putBoolean( "windowMaximized", stage.isMaximized() );
     state.putBoolean( "windowFullScreen", stage.isFullScreen() );
+  }
   private void restore() {
     final double x = state.getDouble( "windowX", Double.NaN );
     final double y = state.getDouble( "windowY", Double.NaN );
     final double w = state.getDouble( "windowWidth", Double.NaN );
     final double h = state.getDouble( "windowHeight", Double.NaN );
     final boolean maximized = state.getBoolean( "windowMaximized", false );
     final boolean fullScreen = state.getBoolean( "windowFullScreen", false );
     if( !Double.isNaN( x ) && !Double.isNaN( y ) ) {
       stage.setX( x );
       stage.setY( y );
     } // else: default behavior is center on screen
     if( !Double.isNaN( w ) && !Double.isNaN( h ) ) {
       stage.setWidth( w );
       stage.setHeight( h );
     } // else: default behavior is use scene size
     if( fullScreen != stage.isFullScreen() ) {
       stage.setFullScreen( fullScreen );
+    }
     if( maximized != stage.isMaximized() ) {
       stage.setMaximized( maximized );
+    }
+  }
   /**
    * Remembers the window bounds when the window is not iconified, maximized or
    * in fullScreen.
    */
   private void boundsChanged() {
     // avoid too many (and useless) runLater() invocations
     if( runLaterPending ) {
       return;
+    }
     runLaterPending = true;
     // must use runLater() to ensure that change of all properties
     // (x, y, width, height, iconified, maximized and fullScreen)
     // has finished
     Platform.runLater( () -> {
       runLaterPending = false;
       if( isNormalState() ) {
         normalBounds = getStageBounds();
+      }
     } );
+  }
   private boolean isNormalState() {
     return !stage.isIconified() && !stage.isMaximized() && !stage.isFullScreen();
+  }
   private Rectangle getStageBounds() {
     return new Rectangle( stage.getX(), stage.getY(), stage.getWidth(), stage.getHeight() );
+  }
+}

A src/main/java/com/scrivenvar/util/Utils.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import java.util.ArrayList;
 import java.util.prefs.Preferences;
 /**
  * @author Karl Tauber
  */
 public class Utils {
   public static boolean safeEquals( final Object o1, final Object o2 ) {
     if( o1 == o2 ) {
       return true;
+    }
     if( o1 == null || o2 == null ) {
       return false;
+    }
     return o1.equals( o2 );
+  }
   public static boolean isNullOrEmpty( final String s ) {
     return s == null || s.isEmpty();
+  }
   public static String ltrim( final String s ) {
     int i = 0;
     while( i < s.length() && Character.isWhitespace( s.charAt( i ) ) ) {
       i++;
+    }
     return s.substring( i );
+  }
   public static String rtrim( final String s ) {
     int i = s.length() - 1;
     while( i >= 0 && Character.isWhitespace( s.charAt( i ) ) ) {
       i--;
+    }
     return s.substring( 0, i + 1 );
+  }
   public static void putPrefs( Preferences prefs, String key, String value, String def ) {
     if( value != def && !value.equals( def ) ) {
       prefs.put( key, value );
     } else {
       prefs.remove( key );
+    }
+  }
   public static void putPrefsInt( Preferences prefs, String key, int value, int def ) {
     if( value != def ) {
       prefs.putInt( key, value );
     } else {
       prefs.remove( key );
+    }
+  }
   public static void putPrefsBoolean( Preferences prefs, String key, boolean value, boolean def ) {
     if( value != def ) {
       prefs.putBoolean( key, value );
     } else {
       prefs.remove( key );
+    }
+  }
   public static String[] getPrefsStrings( final Preferences prefs, String key ) {
     final ArrayList<String> arr = new ArrayList<>( 256 );
     for( int i = 0; i < 10000; i++ ) {
       final String s = prefs.get( key + (i + 1), null );
       if( s == null ) {
         break;
+      }
       arr.add( s );
+    }
     return arr.toArray( new String[ arr.size() ] );
+  }
   public static void putPrefsStrings( Preferences prefs, String key, String[] strings ) {
     for( int i = 0; i < strings.length; i++ ) {
       prefs.put( key + (i + 1), strings[ i ] );
+    }
     for( int i = strings.length; prefs.get( key + (i + 1), null ) != null; i++ ) {
       prefs.remove( key + (i + 1) );
+    }
+  }
+}

A src/main/resources/META-INF/services/com.scrivenvar.service.Options

1
	1	com.scrivenvar.service.impl.DefaultOptions

A src/main/resources/META-INF/services/com.scrivenvar.service.Settings

1
	1	com.scrivenvar.service.impl.DefaultSettings

A src/main/resources/META-INF/services/com.scrivenvar.service.events.AlertService

1
	1	com.scrivenvar.service.events.impl.DefaultAlertService

A src/main/resources/com/scrivenvar/build.sh

 #!/bin/bash
 INKSCAPE=/usr/bin/inkscape
 declare -a SIZES=("16" "32" "64" "128" "256" "512")
 for i in "${SIZES[@]}"; do
   # -y: export background opacity 0
   $INKSCAPE -y 0 -z -f "logo.svg" -w "${i}" -e "logo${i}.png"
 done

A src/main/resources/com/scrivenvar/editor/Markdown.css

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 .markdown-editor {
   -fx-font-size: 14px;
+}
 /*---- headers ----*/
 .markdown-editor .h1 { -fx-font-size: 2.25em; }
 .markdown-editor .h2 { -fx-font-size: 1.75em; }
 .markdown-editor .h3 { -fx-font-size: 1.5em; }
 .markdown-editor .h4 { -fx-font-size: 1.25em; }
 .markdown-editor .h5 { -fx-font-size: 1.1em; }
 .markdown-editor .h6 { -fx-font-size: 1em; }
 .markdown-editor .h1,
 .markdown-editor .h2,
 .markdown-editor .h3,
 .markdown-editor .h4,
 .markdown-editor .h5,
 .markdown-editor .h6 {
   -fx-font-weight: bold;
   -fx-fill: derive(crimson, -20%);
+}
 /*---- inlines ----*/
 .markdown-editor .strong {
   -fx-font-weight: bold;
+}
 .markdown-editor .em {
   -fx-font-style: italic;
+}
 .markdown-editor .del {
   -fx-strikethrough: true;
+}
 .markdown-editor .a {
   -fx-fill: #4183C4 !important;
+}
 .markdown-editor .img {
   -fx-fill: #4183C4 !important;
+}
 .markdown-editor .code {
   -fx-font-family: monospace;
   -fx-fill: #090 !important;
+}
 /*---- blocks ----*/
 .markdown-editor .pre {
   -fx-font-family: monospace;
   -fx-fill: #060 !important;
+}
 .markdown-editor .blockquote {
   -fx-fill: #777;
+}
 /*---- lists ----*/
 .markdown-editor .ul {
+}
 .markdown-editor .ol {
+}
 .markdown-editor .li {
   -fx-fill: #444;
+}
 .markdown-editor .dl {
+}
 .markdown-editor .dt {
   -fx-font-weight: bold;
   -fx-font-style: italic;
+}
 .markdown-editor .dd {
   -fx-fill: #444;
+}
 /*---- table ----*/
 .markdown-editor .table {
   -fx-font-family: monospace;
+}
 .markdown-editor .thead {
+}
 .markdown-editor .tbody {
+}
 .markdown-editor .caption {
+}
 .markdown-editor .th {
   -fx-font-weight: bold;
+}
 .markdown-editor .tr {
+}
 .markdown-editor .td {
+}
 /*---- misc ----*/
 .markdown-editor .html {
   -fx-font-family: monospace;
   -fx-fill: derive(crimson, -50%);
+}
 .markdown-editor .monospace {
   -fx-font-family: monospace;
+}

A src/main/resources/com/scrivenvar/logo.svg

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
    width="512"
    height="512"
    viewBox="0 0 512 512"
    sodipodi:docname="logo.svg">
   <metadata
      id="metadata8">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs6" />
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
      gridtolerance="10"
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="640"
      inkscape:window-height="480"
      id="namedview4"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:zoom="1.2682274"
      inkscape:cx="15.646213"
      inkscape:cy="213.34955"
      inkscape:current-layer="svg2" />
   <path
      style="fill:#ce6200;fill-opacity:1"
      d="m 203.2244,511.85078 c -60.01827,-1.2968 -121.688643,-6.5314 -192.436493,-16.334 -5.8078027,-0.8047 -10.66110747,-1.561 -10.78511762,-1.6806 -0.12404567,-0.1196 3.90488112,-4.5812 8.95313512,-9.9147 32.9484785,-34.8102 70.4314485,-73.8923 104.1521555,-108.5956 l 11.87611,-12.2221 5.48905,-10.2177 c 35.82801,-66.6927 75.13064,-128.5665 105.90637,-166.7277 6.13805,-7.611 10.21451,-12.0689 17.28719,-18.9048 36.6818,-35.4537 108.27279,-83.724003 206.0323,-138.917303 22.10365,-12.47935 51.93386,-28.64995037 52.26391,-28.33165037 0.38883,0.37499 -2.35932,25.95575037 -4.86585,45.29275037 -7.28943,56.236403 -17.04619,103.128903 -28.07642,134.939803 -7.19617,20.7536 -14.81287,35.152 -22.9667,43.4155 -3.60444,3.6529 -6.58328,5.7941 -10.1313,7.2825 l -2.56414,1.0756 -53.43164,0.1713 -53.43166,0.1713 3.69973,1.8547 c 26.78565,13.4282 52.58051,27.5241 59.57122,32.5533 4.48397,3.2259 4.41278,2.9854 1.59124,5.3784 -26.99514,22.8955 -74.52961,44.0013 -140.23089,62.2641 -26.34995,7.3244 -57.85469,14.6842 -86.99871,20.3237 l -10.26943,1.9871 -52.01052,53.2733 -52.010524,53.2732 -29.459801,15.1165 c -26.4100885,13.5517 -29.3446639,15.1388 -28.347645,15.3311 0.6117029,0.118 4.0894221,0.2188 7.7282726,0.2239 3.6388854,0.01 16.1273694,0.2329 27.7522124,0.5059 51.576376,1.2116 146.083985,1.512 170.154295,0.5409 34.66996,-1.3988 52.7606,-2.9325 67.58258,-5.7293 2.68664,-0.507 4.82907,-0.9755 4.76094,-1.0412 -0.0681,-0.066 -3.24733,-0.8833 -7.0649,-1.8169 -8.04133,-1.9664 -25.10167,-5.3107 -41.1231,-8.0612 -47.6405,-8.1787 -65.48708,-12.0107 -74.13028,-15.9169 -3.90548,-1.7651 -7.13816,-4.7659 -8.12937,-7.5463 -1.01822,-2.8562 -0.92214,-6.5271 0.23315,-8.9083 1.86563,-3.8451 6.14837,-6.7199 12.26745,-8.2345 16.96993,-4.2004 57.27977,-6.1832 90.36228,-4.4448 54.7332,2.8761 117.0767,13.1228 178.50212,29.3385 18.03514,4.7611 51.66065,14.656 51.22677,15.0744 -0.0824,0.08 -5.72762,-0.854 -12.54488,-2.0745 -40.1043,-7.18 -60.50854,-10.2888 -101.40822,-15.4507 -24.4851,-3.0902 -55.12614,-5.9915 -77.58876,-7.3465 -26.58826,-1.6039 -61.15821,-1.7754 -80.99202,-0.4019 l -3.19705,0.2214 8.70308,1.4934 c 51.89698,8.9047 77.51746,14.9877 88.00479,20.8948 6.9134,3.894 10.30497,9.4381 9.33333,15.2569 -1.50397,9.0066 -10.51381,14.0257 -32.00273,17.8278 -16.31374,2.8863 -47.27575,4.3845 -77.23553,3.7371 z"
      id="path4138" />
   <path
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
      d="m 214.76931,324.51908 c 60.83777,-14.1145 111.89562,-31.6251 144.40025,-49.5229 3.12602,-1.7213 5.81747,-3.2537 5.98106,-3.4054 0.40534,-0.3759 -13.76388,-7.9415 -34.63489,-18.4929 -7.52161,-3.8026 -9.82337,-5.3787 -12.0735,-8.2668 -5.14485,-6.6036 -5.96081,-14.8404 -2.20331,-22.2417 1.80288,-3.5512 5.69484,-7.3007 9.36158,-9.019 5.20851,-2.4407 1.18148,-2.2865 59.71223,-2.2865 l 52.81361,0 2.13233,-2.1984 c 2.78673,-2.8731 5.23414,-6.4981 8.23035,-12.1905 14.14966,-26.8827 26.71842,-78.3816 36.24347,-148.503303 0.76704,-5.6468 1.36194,-10.2983 1.32201,-10.3369 -0.0399,-0.038 -5.47754,2.9629 -12.08361,6.6697 l -12.01104,6.7396 -133.83068,137.037303 c -73.60688,75.3705 -134.81732,138.0567 -136.0232,139.3026 l -2.19251,2.2653 8.254,-1.8067 c 4.53969,-0.9937 12.01053,-2.6783 16.60185,-3.7435 z"
      id="path4136" />
   <path
      style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
      d="m 202.72524,284.43588 c 69.93294,-70.1332 135.4799,-131.9279 213.46406,-201.244203 7.71421,-6.8568 14.50542,-12.9341 15.09155,-13.5052 0.9482,-0.9239 0.96778,-0.9811 0.17761,-0.5188 -77.96496,45.611803 -139.23519,88.710503 -166.72539,117.278203 -18.81811,19.5556 -50.35654,64.861 -80.96704,116.3104 -0.91787,1.5427 1.02249,-0.3323 18.95921,-18.3204 z"
      id="path4142" />
   <path
      style="fill:#000000"
      d=""
      id="path4140"
      inkscape:connector-curvature="0" />
 </svg>

A src/main/resources/com/scrivenvar/logo128.png

Binary file

A src/main/resources/com/scrivenvar/logo16.png

Binary file

A src/main/resources/com/scrivenvar/logo256.png

Binary file

A src/main/resources/com/scrivenvar/logo32.png

Binary file

A src/main/resources/com/scrivenvar/logo512.png

Binary file

A src/main/resources/com/scrivenvar/logo64.png

Binary file

A src/main/resources/com/scrivenvar/messages.properties

+#
 # Copyright 2016 Karl Tauber and White Magic Software, Ltd.
+#
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
+#
 #  * Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
+#
 #  * Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
 # ########################################################################
+#
 # Main Application Window
+#
 # ########################################################################
 # The application title should exist only once in the entire code base.
 # All other references should either refer to this value via the Messages
 # class, or indirectly using ${Main.title}.
 Main.title=Scrivenvar
 Main.menu.file=_File
 Main.menu.file.new=New
 Main.menu.file.open=Open...
 Main.menu.file.close=Close
 Main.menu.file.close_all=Close All
 Main.menu.file.save=Save
 Main.menu.file.save_all=Save All
 Main.menu.file.exit=Exit
 Main.menu.edit=_Edit
 Main.menu.edit.undo=Undo
 Main.menu.edit.redo=Redo
 Main.menu.insert=_Insert
 Main.menu.insert.bold=Bold
 Main.menu.insert.italic=Italic
 Main.menu.insert.strikethrough=Strikethrough
 Main.menu.insert.blockquote=Blockquote
 Main.menu.insert.code=Inline Code
 Main.menu.insert.fenced_code_block=Fenced Code Block
 Main.menu.insert.fenced_code_block.prompt=Enter code here
 Main.menu.insert.link=Link...
 Main.menu.insert.image=Image...
 Main.menu.insert.header_1=Header 1
 Main.menu.insert.header_1.prompt=header 1
 Main.menu.insert.header_2=Header 2
 Main.menu.insert.header_2.prompt=header 2
 Main.menu.insert.header_3=Header 3
 Main.menu.insert.header_3.prompt=header 3
 Main.menu.insert.header_4=Header 4
 Main.menu.insert.header_4.prompt=header 4
 Main.menu.insert.header_5=Header 5
 Main.menu.insert.header_5.prompt=header 5
 Main.menu.insert.header_6=Header 6
 Main.menu.insert.header_6.prompt=header 6
 Main.menu.insert.unordered_list=Unordered List
 Main.menu.insert.ordered_list=Ordered List
 Main.menu.insert.horizontal_rule=Horizontal Rule
 Main.menu.tools=_Tools
 Main.menu.tools.options=Options
 Main.menu.help=_Help
 Main.menu.help.about=About ${Main.title}
 # ########################################################################
+#
 # About Dialog
+#
 # ########################################################################
 Dialog.about.title=About
 Dialog.about.header=${Main.title}
 Dialog.about.content=Copyright 2016 White Magic Software, Ltd.\n\nBased on Markdown Writer FX by Karl Tauber
 # ########################################################################
+#
 # File Editor
+#
 # ########################################################################
 FileEditor.untitled=Untitled
 FileEditor.loadFailed.message=Failed to load ''{0}''.\n\nReason: {1}
 FileEditor.loadFailed.title=Load
 FileEditor.saveFailed.message=Failed to save ''{0}''.\n\nReason: {1}
 FileEditor.saveFailed.title=Save
 # ########################################################################
+#
 # File Open
+#
 # ########################################################################
 Dialog.file.choose.open.title=Open File
 Dialog.file.choose.save.title=Save File
 Dialog.file.choose.filter.title.markdown=Markdown Files
 Dialog.file.choose.filter.title.definition=Definition Files
 Dialog.file.choose.filter.title.xml=XML Files
 Dialog.file.choose.filter.title.all=All Files
 # ########################################################################
+#
 # Alert Dialog
+#
 # ########################################################################
 Alert.file.close.title=Close
 Alert.file.close.text=Save changes to {0}?
 # ########################################################################
+#
 # Definition Pane
+#
 # ########################################################################
 Pane.defintion.node.root.title=Definitions
 # Controls ###############################################################
 # ########################################################################
+#
 # Browse Directory
+#
 # ########################################################################
 BrowseDirectoryButton.chooser.title=Browse for local folder
 BrowseDirectoryButton.tooltip=${BrowseDirectoryButton.chooser.title}
 # ########################################################################
+#
 # Browse File
+#
 # ########################################################################
 BrowseFileButton.chooser.title=Browse for local file
 BrowseFileButton.chooser.allFilesFilter=All Files
 BrowseFileButton.tooltip=${BrowseFileButton.chooser.title}
 # Dialogs ################################################################
 # ########################################################################
+#
 # Image
+#
 # ########################################################################
 ImageDialog.title=Image
 ImageDialog.chooser.imagesFilter=Images
 ImageDialog.previewLabel.text=Markdown Preview\:
 ImageDialog.textLabel.text=Alternate Text\:
 ImageDialog.titleLabel.text=Title (tooltip)\:
 ImageDialog.urlLabel.text=Image URL\:
 # ########################################################################
+#
 # Hyperlink
+#
 # ########################################################################
 LinkDialog.title=Link
 LinkDialog.previewLabel.text=Markdown Preview\:
 LinkDialog.textLabel.text=Link Text\:
 LinkDialog.titleLabel.text=Title (tooltip)\:
 LinkDialog.urlLabel.text=Link URL\:
 # Options ################################################################
 # ########################################################################
+#
 # Options Dialog
+#
 # ########################################################################
 OptionsDialog.title=Options
 OptionsDialog.generalTab.text=General
 OptionsDialog.markdownTab.text=Markdown
 # ########################################################################
+#
 # General Options Pane
+#
 # ########################################################################
 GeneralOptionsPane.encodingLabel.text=En_coding\:
 GeneralOptionsPane.lineSeparatorLabel.text=_Line separator\:
 GeneralOptionsPane.lineSeparatorLabel2.text=(applies to new files only)
 GeneralOptionsPane.platformDefault=Platform Default ({0})
 GeneralOptionsPane.sepWindows=Windows (CRLF)
 GeneralOptionsPane.sepUnix=Unix (LF)
 # ########################################################################
+#
 # Markdown Options Pane
+#
 # ########################################################################
 MarkdownOptionsPane.abbreviationsExtCheckBox.text=A_bbreviations in the way of
 MarkdownOptionsPane.abbreviationsExtLink.text=Markdown Extra
 MarkdownOptionsPane.anchorlinksExtCheckBox.text=_Anchor links in headers
 MarkdownOptionsPane.atxHeaderSpaceExtCheckBox.text=Requires a space char after Atx \# header prefixes, so that \#dasdsdaf is not a header
 MarkdownOptionsPane.autolinksExtCheckBox.text=_Plain (undelimited) autolinks in the way of
 MarkdownOptionsPane.autolinksExtLink.text=Github-flavoured-Markdown
 MarkdownOptionsPane.definitionListsExtCheckBox.text=_Definition lists in the way of
 MarkdownOptionsPane.definitionListsExtLink.text=Markdown Extra
 MarkdownOptionsPane.extAnchorLinksExtCheckBox.text=Generate anchor links for headers using complete contents of the header
 MarkdownOptionsPane.fencedCodeBlocksExtCheckBox.text=_Fenced Code Blocks in the way of
 MarkdownOptionsPane.fencedCodeBlocksExtLabel.text=or
 MarkdownOptionsPane.fencedCodeBlocksExtLink.text=Markdown Extra
 MarkdownOptionsPane.fencedCodeBlocksExtLink2.text=Github-flavoured-Markdown
 MarkdownOptionsPane.forceListItemParaExtCheckBox.text=Force List and Definition Paragraph wrapping if it includes more than just a single paragraph
 MarkdownOptionsPane.hardwrapsExtCheckBox.text=_Newlines in paragraph-like content as real line breaks, see
 MarkdownOptionsPane.hardwrapsExtLink.text=Github-flavoured-Markdown
 MarkdownOptionsPane.quotesExtCheckBox.text=Beautify single _quotes, double quotes and double angle quotes (\u00ab and \u00bb)
 MarkdownOptionsPane.relaxedHrRulesExtCheckBox.text=Allow horizontal rules without a blank line following them
 MarkdownOptionsPane.smartsExtCheckBox.text=Beautify apostrophes, _ellipses ("..." and ". . .") and dashes ("--" and "---")
 MarkdownOptionsPane.strikethroughExtCheckBox.text=_Strikethrough
 MarkdownOptionsPane.suppressHtmlBlocksExtCheckBox.text=Suppress the _output of HTML blocks
 MarkdownOptionsPane.suppressInlineHtmlExtCheckBox.text=Suppress the o_utput of inline HTML elements
 MarkdownOptionsPane.tablesExtCheckBox.text=_Tables similar to
 MarkdownOptionsPane.tablesExtLabel.text=(like
 MarkdownOptionsPane.tablesExtLabel2.text=tables, but with colspan support)
 MarkdownOptionsPane.tablesExtLink.text=MultiMarkdown
 MarkdownOptionsPane.tablesExtLink2.text=Markdown Extra
 MarkdownOptionsPane.taskListItemsExtCheckBox.text=GitHub style task list items
 MarkdownOptionsPane.wikilinksExtCheckBox.text=_Wiki-style links ("[[wiki link]]")

A src/main/resources/com/scrivenvar/preview/webview.css

 /*
 This software is released under the MIT license:
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 /* Source: https://github.com/nicolashery/markdownpad-github */
 /*  GitHub stylesheet for MarkdownPad (http://markdownpad.com) */
 /* RESET
 =============================================================================*/
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
+}
 /* BODY
 =============================================================================*/
 body {
   font-family: Helvetica, arial, freesans, clean, sans-serif;
   font-size: 14px;
   line-height: 1.6;
   color: #333;
   background-color: #fff;
   padding: 20px;
   max-width: 960px;
   margin: 0 auto;
+}
 body>*:first-child {
   margin-top: 0 !important;
+}
 body>*:last-child {
   margin-bottom: 0 !important;
+}
 /* BLOCKS
 =============================================================================*/
 p, blockquote, ul, ol, dl, table, pre {
   margin: 15px 0;
+}
 /* HEADERS
 =============================================================================*/
 h1, h2, h3, h4, h5, h6 {
   margin: 20px 0 10px;
   padding: 0;
   font-weight: bold;
   -webkit-font-smoothing: antialiased;
+}
 h1 tt, h1 code, h2 tt, h2 code, h3 tt, h3 code, h4 tt, h4 code, h5 tt, h5 code, h6 tt, h6 code {
   font-size: inherit;
+}
 h1 {
   font-size: 28px;
   color: #000;
+}
 h2 {
   font-size: 24px;
   border-bottom: 1px solid #ccc;
   color: #000;
+}
 h3 {
   font-size: 18px;
+}
 h4 {
   font-size: 16px;
+}
 h5 {
   font-size: 14px;
+}
 h6 {
   color: #777;
   font-size: 14px;
+}
 body>h2:first-child, body>h1:first-child, body>h1:first-child+h2, body>h3:first-child, body>h4:first-child, body>h5:first-child, body>h6:first-child {
   margin-top: 0;
   padding-top: 0;
+}
 a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 {
   margin-top: 0;
   padding-top: 0;
+}
 h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
   margin-top: 10px;
+}
 /* LINKS
 =============================================================================*/
 a {
   color: #4183C4;
   text-decoration: none;
+}
 a:hover {
   text-decoration: underline;
+}
 /* LISTS
 =============================================================================*/
 ul, ol {
   padding-left: 30px;
+}
 ul li > :first-child,
 ol li > :first-child,
 ul li ul:first-of-type,
 ol li ol:first-of-type,
 ul li ol:first-of-type,
 ol li ul:first-of-type {
   margin-top: 0px;
+}
 ul ul, ul ol, ol ol, ol ul {
   margin-bottom: 0;
+}
 dl {
   padding: 0;
+}
 dl dt {
   font-size: 14px;
   font-weight: bold;
   font-style: italic;
   padding: 0;
   margin: 15px 0 5px;
+}
 dl dt:first-child {
   padding: 0;
+}
 dl dt>:first-child {
   margin-top: 0px;
+}
 dl dt>:last-child {
   margin-bottom: 0px;
+}
 dl dd {
   margin: 0 0 15px;
   padding: 0 15px;
+}
 dl dd>:first-child {
   margin-top: 0px;
+}
 dl dd>:last-child {
   margin-bottom: 0px;
+}
 /* CODE
 =============================================================================*/
 pre, code, tt {
   font-size: 12px;
   font-family: Consolas, "Liberation Mono", Courier, monospace;
+}
 code, tt {
   margin: 0 0px;
   padding: 0px 0px;
   white-space: nowrap;
   border: 1px solid #eaeaea;
   background-color: #f8f8f8;
   border-radius: 3px;
+}
 pre>code {
   margin: 0;
   padding: 0;
   white-space: pre;
   border: none;
   background: transparent;
+}
 pre {
   background-color: #f8f8f8;
   border: 1px solid #ccc;
   font-size: 13px;
   line-height: 19px;
   overflow: auto;
   padding: 6px 10px;
   border-radius: 3px;
+}
 pre code, pre tt {
   background-color: transparent;
   border: none;
+}
 kbd {
   -moz-border-bottom-colors: none;
   -moz-border-left-colors: none;
   -moz-border-right-colors: none;
   -moz-border-top-colors: none;
   background-color: #DDDDDD;
   background-image: linear-gradient(#F1F1F1, #DDDDDD);
   background-repeat: repeat-x;
   border-color: #DDDDDD #CCCCCC #CCCCCC #DDDDDD;
   border-image: none;
   border-radius: 2px 2px 2px 2px;
   border-style: solid;
   border-width: 1px;
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   line-height: 10px;
   padding: 1px 4px;
+}
 /* QUOTES
 =============================================================================*/
 blockquote {
   border-left: 4px solid #DDD;
   padding: 0 15px;
   color: #777;
+}
 blockquote>:first-child {
   margin-top: 0px;
+}
 blockquote>:last-child {
   margin-bottom: 0px;
+}
 /* HORIZONTAL RULES
 =============================================================================*/
 hr {
   clear: both;
   margin: 15px 0;
   height: 0px;
   overflow: hidden;
   border: none;
   background: transparent;
   border-bottom: 4px solid #ddd;
   padding: 0;
+}
 /* TABLES
 =============================================================================*/
 table th {
   font-weight: bold;
+}
 table th, table td {
   border: 1px solid #ccc;
   padding: 6px 13px;
+}
 table tr {
   border-top: 1px solid #ccc;
   background-color: #fff;
+}
 table tr:nth-child(2n) {
   background-color: #f8f8f8;
+}
 /* IMAGES
 =============================================================================*/
 img {
   max-width: 100%
+}
 /* CARET
 =============================================================================*/
 #CARETPOSITION {
   border-right:1px solid #333;
   margin-right:-1px;
   animation: blink 1s linear infinite;
+}
 @keyframes blink {
   from {
     visibility:hidden;
+  }
 % {
     visibility:hidden;
+  }
   to {
     visibility:visible;
+  }
+}

A src/main/resources/com/scrivenvar/scene.css

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*---- toolbar ----*/
 .tool-bar {
 	-fx-spacing: 0;
+}
 .tool-bar .button {
 	-fx-background-color: transparent;
+}
 .tool-bar .button:hover {
 	-fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
 	-fx-color: -fx-hover-base;
+}
 .tool-bar .button:armed {
 	-fx-color: -fx-pressed-base;
+}

A src/main/resources/com/scrivenvar/settings.properties

 # ########################################################################
+#
 # Application
+#
 # ########################################################################
 application.title=scrivenvar
 application.package=com/${application.title}
 application.messages= com.${application.title}.messages
 # ########################################################################
+#
 # Preferences
+#
 # ########################################################################
 preferences.root=com.${application.title}
 preferences.root.state=state
 preferences.root.options=options
 # ########################################################################
+#
 # File References
+#
 # ########################################################################
 file.stylesheet.scene=${application.package}/scene.css
 file.stylesheet.markdown=${application.package}/editor/Markdown.css
 file.stylesheet.preview=webview.css
 file.logo.16 =${application.package}/logo16.png
 file.logo.32 =${application.package}/logo32.png
 file.logo.128=${application.package}/logo128.png
 file.logo.256=${application.package}/logo256.png
 file.logo.512=${application.package}/logo512.png
 # ########################################################################
+#
 # Caret token
+#
 # ########################################################################
 caret.token.base=CARETPOSITION
 caret.token.markdown=%${constant.caret.token.base}%
 caret.token.xml=<![CDATA[${constant.caret.token.markdown}]]>
 caret.token.html=<span id="${caret.token.base}"></span>
 # ########################################################################
+#
 # Filename Extensions
+#
 # ########################################################################
 # Comma-separated list of definition filename extensions.
 file.ext.definition.json=*.json
 file.ext.definition.toml=*.toml
 file.ext.definition.yaml=*.yml,*.yaml
 file.ext.definition.properties=*.properties,*.props
 # Comma-separated list of filename extensions.
 filter.file.ext.markdown=*.Rmd,*.md,*.markdown,*.mkdown,*.mdown,*.mkdn,*.mkd,*.mdwn,*.mdtxt,*.mdtext,*.text,*.txt
 filter.file.ext.definition=${file.ext.definition.yaml}
 filter.file.ext.xml=*.xml,*.Rxml
 filter.file.ext.all=*.*
 # ########################################################################
+#
 # Variable Name Editor
+#
 # ########################################################################
 # Maximum number of characters for a variable name. A variable is defined
 # as one or more non-whitespace characters up to this maximum length.
 editor.variable.maxLength=256
 # ########################################################################
+#
 # Dialog Preferences
+#
 # ########################################################################
 # docs.oracle.com/javase/8/javafx/api/javafx/scene/control/ButtonBar.html
 dialog.alert.button.order.mac=L_HE+U+FBIX_NCYOA_R
 dialog.alert.button.order.linux=L_HE+UNYACBXIO_R
 dialog.alert.button.order.windows=L_E+U+FBXI_YNOCAH_R
 # Ensures a consistent button order for alert dialogs across platforms (because
 # the default button order on Linux defies all logic). Power to the people.
 dialog.alert.button.order=${dialog.alert.button.order.windows}

A src/main/resources/com/scrivenvar/variables.yaml

 ---
 c:
   protagonist:
     name:
       First: Chloe
       First_pos: $c.protagonist.name.First$'s
       Middle: Irene
       Family: Angelos
       nick:
         Father: Savant
         Mother: Sweetie
     colour:
       eyes: green
       hair: dark auburn
       syn_1: black
       syn_2: purple
       syn_11: teal
       syn_6: silver
       favourite: emerald green
     speech:
       tic: oh
     father:
       heritage: Greek
       name:
         Short: Bryce
         First: Bryson
         First_pos: $c.protagonist.father.name.First$'s
         Honourific: Mr.
       education: Masters
       vocation:
         name: robotics
         title: roboticist
       employer:
         name:
           Short: Rabota
           Full: $c.protagonist.father.employer.name.Short$ Designs
       hair:
         style: thick, curly
         colour: black
       eyes:
         colour: dark brown
       Endear: Dad
       vehicle: coupé
     mother:
       name:
         Short: Cass
         First: Cassandra
         First_pos: $c.protagonist.mother.name.First$'s
         Honourific: Mrs.
       education: PhD
       speech:
         tic: cute
         Honorific: Doctor
       vocation:
         article: an
         name: oceanography
         title: oceanographer
       employer:
         name:
           Full: Oregon State University
           Short: OSU
       eyes:
         colour: blue
       hair:
         style: thick, curly
         colour: dark brown
       Endear: Mom
       Endear_pos: Mom's
     uncle:
       name:
         First: Damian
         First_pos: $c.protagonist.uncle.name.First$'s
         Family: Moros
       hands:
         fingers:
           shape: long, bony
     friend:
       primary:
         name:
           First: Gerard
           First_pos: $c.protagonist.friend.primary.name.First$'s
           Family: Baran
           Family_pos: $c.protagonist.friend.primary.name.Family$'s
         favourite:
           colour: midnight blue
         eyes:
           colour: hazel
         mother:
           name:
             First: Isabella
             Short: Izzy
             Honourific: Mrs.
         father:
           name:
             Short: Mo
             First: Montgomery
             First_pos: $c.protagonist.friend.primary.father.name.First$'s
             Honourific: Mr.
           speech:
             tic: y'know
           endear: Pops
   military:
     primary:
       name:
         First: Felix
         Family: LeMay
         Family_pos: LeMay's
       rank:
         Short: General
         Full: Brigadier $c.military.primary.rank.Short$
       colour:
         eyes: gray
         hair: dirty brown
     secondary:
       name:
         Family: Grell
       rank: Colonel
       colour:
         eyes: green
         hair: deep red
     quaternary:
       name:
         First: Gretchen
         Family: Steinherz
   minor:
     primary:
       name:
         First: River
         Family: Banks
         Honourific: Mx.
       vocation:
         title: salesperson
       employer:
         Name: Geophysical Prospecting Incorporated
         Abbr: GPI
         Area: Cold Spring Creek
         payment: twenty million
     secondary:
       name:
         First: Renato
         Middle: Carroña
         Family: Salvatierra
         Family_pos: $c.minor.secondary.name.Family$'s
         Full: $c.minor.secondary.name.First$ $c.minor.secondary.name.Middle$ Alejandro Gregorio Eduardo Salomón Vidal $c.minor.secondary.name.Family$
         Honourific: Mister
         Honourific_sp: Señor
       vocation:
         title: detective
     tertiary:
       name:
         First: Robert
         Family: Hanssen
   ai:
     protagonist:
       name:
         first: yoky
         First: Yoky
         First_pos: $c.ai.protagonist.name.First$'s
         Family: Tsukuda
         id: 46692
       persona:
         name:
           First: Hoshi
           First_pos: $c.ai.protagonist.persona.name.First$'s
           Family: Yamamoto
           Family_pos: $c.ai.protagonist.persona.name.Family$'s
       culture: Japanese-American
       ethnicity: Asian
       rank: Technical Sergeant
       speech:
         tic: okay
     first:
       Name: Prôtos
       Name_pos: Prôtos'
       age:
         actual: twenty-six weeks
         virtual: five years
     second:
       Name: Défteros
     third:
       Name: Trítos
     fourth:
       Name: Tétartos
     material:
       type: metal
       raw: ilmenite
       extract: ore
       name:
         short: titanium
         long: $c.ai.material.name.short$ dioxide
         Abbr: TiO~2~
       pejorative: tin
   animal:
     protagonist:
       Name: Trufflers
       type: pig
     antagonist:
       name: coywolf
       Name: Coywolf
       plural: coywolves
 narrator:
   one: (by $c.protagonist.father.name.First$ $c.protagonist.name.Family$)
   two: (by $c.protagonist.mother.name.First$ $c.protagonist.name.Family$)
 military:
   name:
     Short: Agency
     Short_pos: $military.name.Short$'s
     plural: agencies
   machine:
     Name: Skopós
     Name_pos: $military.machine.Name$'
     Location: Arctic
     predictor: quantum chips
   land:
     name:
       Full: $military.name.Short$ of Defence
     Slogan: Safety in Numbers
   air:
     name:
       Full: $military.name.Short$ of Air
   compound:
     type: base
     lights:
       colour: blue
     nick:
       Prefix: Catacombs
       prep: of
       Suffix: Tartarus
 government:
   Country: United States
 location:
   protagonist:
     City: Corvallis
     Region: Oregon
     Geography: Willamette Valley
     secondary:
       City: Willow Branch Spring
       Region: Oregon
       Geography: Wheeler County
       Water: Clarno Rapids
       Road: Shaniko-Fossil Highway
     tertiary:
       City: Leavenworth
       Region: Washington
       Type: Bavarian village
     school:
       address: 1400 Northwest Buchanan Avenue
     hospital:
       Name: Good Samaritan Regional Medical Center
   ai:
     escape:
       country:
         Name: Ecuador
         Name_pos: Ecuador's
       mountain:
         Name: Chimborazo
 language:
   ai:
     article: an
     singular: exanimis
     plural: exanimēs
     brain:
       singular: superum
       plural: supera
     title: memristor array
     Title: Memristor Array
   police:
     slang:
       singular: mippo
       plural: $language.police.slang.singular$s
 date:
   anchor: 2042-09-02
   protagonist:
     born: 0
     conceived: -243
     attacked:
       first: 2192
       second: 8064
     father:
       attacked:
         first: -8205
       date:
         second: -1550
     family:
       moved:
         first: $date.protagonist.conceived$ + 35
   game:
     played:
       first: $date.protagonist.born$ - 672
       second: $date.protagonist.family.moved.first$ + 2
   ai:
     interviewed: 6198
     onboarded: $date.ai.interviewed$ + 290
     diagnosed: $date.ai.onboarded$ + 2
     resigned: $date.ai.diagnosed$ + 3
     trapped: $date.ai.resigned$ + 26
     torturer: $date.ai.trapped$ + 18
     memristor: $date.ai.torturer$ + 61
     ethics: $date.ai.memristor$ + 415
     trained: $date.ai.ethics$ + 385
     mindjacked: $date.ai.trained$ + 22
     bombed: $date.ai.mindjacked$ + 458
   military:
     machine:
       Construction: Six years
 plot:
   Log: $c.ai.protagonist.name.First_pos$ Chronicles
   Channel: Quantum Channel
   device:
     computer:
       Name: Tau
     network:
       Name: Internet
     paper:
       name:
         full: electronic sheet
         short: sheet
     typewriter:
       Name: Underwood
       year: nineteen twenties
       room: root cellar
     portable:
       name: nanobook
     vehicle:
       name: robocars
       Name: Robocars
     sensor:
       name: BMP1580
     phone:
       name: comm
       name_pos: $plot.device.phone.name$'s
       Name: Comm
       plural: $plot.device.phone.name$s
     video:
       name: vidfeed
       plural: $plot.device.video.name$s
     game:
       Name: Psynæris
       thought: transed
       machine: telecognos
       location:
         Building: Nijō Castle
         District: Gion
         City: Kyoto
         Country: Japan
 farm:
   population:
     estimate: 350
     actual: 1,000
   energy: 9800kJ
   width: 55m
   length: 55m
   storeys: 10
 lamp:
   height: 0.17m
   length: 1.22m
   width: 0.28m
 crop:
   name:
     singular: tomato
     plural: $crop.name.singular$es
   energy: 318kJ
   weight: 450g
   yield: 50
   harvests: 7
   diameter: 2m
   height: 1.5m
 heading:
   ch_01: Till
   ch_02: Sow
   ch_03: Seed
   ch_04: Germinate
   ch_05: Grow
   ch_06: Shoot
   ch_07: Bud
   ch_08: Bloom
   ch_09: Pollinate
   ch_10: Fruit
   ch_11: Harvest
   ch_12: Deliver
   ch_13: Spoil
   ch_14: Revolt
   ch_15: Compost
   ch_16: Burn
   ch_17: Release
   ch_18: End Notes
   ch_19: Characters
 inference:
   unit: per cent
   min: two
   ch_sow: eighty
   ch_seed: fifty-two
   ch_germinate: thirty-one
   ch_grow: fifteen
   ch_shoot: seven
   ch_bloom: four
   ch_pollinate: two
   ch_harvest: ninety-five
   ch_delivery: ninety-eight
 link:
   tartarus: https://en.wikipedia.org/wiki/Tartarus
   exploits: https://www.google.ca/search?q=inurl:ftp+password+filetype:xls
   atalanta: https://en.wikipedia.org/wiki/Atalanta
   detain: https://goo.gl/RCNuOQ
   ceramics: https://en.wikipedia.org/wiki/Transparent_ceramics
   algernon: https://en.wikipedia.org/wiki/Flowers_for_Algernon
   holocaust: https://en.wikipedia.org/wiki/IBM_and_the_Holocaust
   memristor: http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.404.9037\&rep=rep1\&type=pdf
   surveillance: https://www.youtube.com/watch?v=XEVlyP4_11M#t=1487
   tor: https://www.torproject.org
   hydra: https://en.wikipedia.org/wiki/Lernaean_Hydra
   foliage: http://www.ncbi.nlm.nih.gov/pmc/articles/PMC3691134
   drake: http://www.bbc.com/future/story/20120821-how-many-alien-worlds-exist
   fermi: https://arxiv.org/pdf/1404.0204v1.pdf
   face: https://www.youtube.com/watch?v=ladqJQLR2bA
   expenditures: http://wikipedia.org/wiki/List_of_countries_by_military_expenditures
   governance: http://papers.ssrn.com/sol3/papers.cfm?abstract_id=2003531
   asimov: https://en.wikipedia.org/wiki/Three_Laws_of_Robotics
   clarke: https://en.wikipedia.org/wiki/Clarke's_three_laws
   jetpack: http://jetpackaviation.com/
   hoverboard: https://www.youtube.com/watch?v=WQzLrvz4DKQ
   eyes_five: https://en.wikipedia.org/wiki/Five_Eyes
   eyes_nine: https://www.privacytools.io/
   eyes_fourteen: http://electrospaces.blogspot.nl/2013/12/14-eyes-are-3rd-party-partners-forming.html
   tourism: http://www.spacefuture.com/archive/investigation_on_the_economic_and_technological_feasibiity_of_commercial_passenger_transportation_into_leo.shtml